minmax: New module, safe min and max macros

[ccan] / Makefile-ccan

diff --git a/Makefile-ccan b/Makefile-ccan
index bac2dd17c7bcc6f9004d9e0574544c1e6e615a0e..1d17e26fa0d48dc2eccfb96ac2365ec8b016490d 100644 (file)
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -2,23 +2,127 @@
 # For simple projects you could just do:
 #      SRCFILES += $(wildcard ccan/*/*.c)
 
-CFLAGS=-g -O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I. $(DEPGEN)
+#CCAN_CFLAGS=-g -O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wundef -DCCAN_STR_DEBUG=1
+CCAN_CFLAGS=-g3 -ggdb -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wundef -DCCAN_STR_DEBUG=1
+CFLAGS = $(CCAN_CFLAGS) -I. $(DEPGEN)
 
-# Automatic dependency generation: makes ccan/*.d files.
+# Modules which are just a header:
+MODS_NO_SRC := alignof \
+       argcheck \
+       array_size \
+       asearch \
+       bitmap \
+       build_assert \
+       bytestring \
+       cast \
+       check_type \
+       compiler \
+       container_of \
+       darray \
+       endian \
+       minmax \
+       objset \
+       short_types \
+       tcon \
+       tlist \
+       typesafe_cb \
+       version
+
+# No external dependencies, with C code:
+MODS_WITH_SRC := antithread \
+       antithread/alloc \
+       asort \
+       asprintf \
+       autodata \
+       avl \
+       bdelta \
+       block_pool \
+       breakpoint \
+       btree \
+       ccan_tokenizer \
+       charset \
+       ciniparser \
+       crc \
+       crcsync \
+       cpuid \
+       daemonize \
+       daemon_with_notify \
+       dgraph \
+       err \
+       failtest \
+       foreach \
+       grab_file \
+       hash \
+       heap \
+       htable \
+       idtree \
+       ilog \
+       io \
+       isaac \
+       iscsi \
+       jmap \
+       json \
+       jset \
+       lbalance \
+       likely \
+       list \
+       md4 \
+       net \
+       nfs \
+       noerr \
+       ogg_to_pcm \
+       opt \
+       ptr_valid \
+       rbtree \
+       rbuf \
+       read_write_all \
+       rfc822 \
+       siphash \
+       sparse_bsearch \
+       str \
+       stringmap \
+       strmap \
+       strset \
+       str_talloc \
+       take \
+       tal \
+       tal/link \
+       tal/path \
+       tal/str \
+       tal/talloc \
+       talloc \
+       talloc_link \
+       tally \
+       tap \
+       time \
+       timer \
+       ttxml \
+       wwviaudio
+
+MODS:=$(MODS_WITH_SRC) $(MODS_NO_SRC)
+
+default: libccan.a
+
+# Automatic dependency generation: makes ccan/*/*.d files.
 DEPGEN=-MD
 -include ccan/*/*.d
 
-# Every directory with .c files is included.
-DIRS=$(filter-out $(EXCLUDE), $(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/*.c)))))
+# Anything with C files needs building; dir leaves / on, sort uniquifies
+DIRS=$(patsubst %/, %, $(sort $(foreach m, $(filter-out $(MODS_EXCLUDE), $(MODS_WITH_SRC)), $(dir $(wildcard ccan/$m/*.c)))))
+
+# Generate everyone's separate Makefiles.
+-include $(foreach dir, $(DIRS), $(dir)-Makefile)
+
+ccan/%-Makefile:
+       @echo $@: $(wildcard ccan/$*/*.[ch]) ccan/$*/_info > $@
+       @echo ccan/$*.o: $(patsubst %.c, %.o, $(wildcard ccan/$*/*.c)) >> $@
 
 # We compile all the ccan/foo/*.o files together into ccan/foo.o
 OBJFILES=$(DIRS:=.o)
 
-libccan.a: $(OBJFILES)
-       $(AR) r $@ $^
-
-# Dependencies are autogenerated in the .d files.
 # We create all the .o files and link them together.
 $(OBJFILES): %.o:
-       cd $* && $(CC) -I../.. $(CFLAGS) -c *.c && cd ../.. && $(LD) -r -o $@ `echo $*/*.c ' ' | sed 's/\.c /.o /g'`
+       $(LD) -r -o $@ $^
 
+libccan.a: $(OBJFILES)
+       $(AR) r $@ $(OBJFILES)