X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile-ccan;h=249d0bb0e752815292536e11c2796f9be8afe29c;hp=68f7d02dd291948232441ad3e29d4acfb2265fd2;hb=dc8042b42500f79f613b1197df6cdf739615a89f;hpb=9d724ba2aa3b69cc56d20e5f578b2c1399e965f6

diff --git a/Makefile-ccan b/Makefile-ccan
index 68f7d02d..249d0bb0 100644
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -1,23 +1,125 @@
 # Example makefile which makes a "libccan.a" of everything under ccan/.
 # For simple projects you could just do:
-#	SRCFILES += $(wildcard ccan/*/[a-z]*.c)
+#	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.
+# Normal modules: no external dependencies, just a header:
+MODS_NORMAL_NO_SRC := alignof \
+	array_size \
+	asearch \
+	build_assert \
+	bytestring \
+	cast \
+	check_type \
+	compiler \
+	container_of \
+	darray \
+	endian \
+	objset \
+	short_types \
+	tcon \
+	tlist \
+	typesafe_cb
+
+# No external dependencies, with C code:
+MODS_NORMAL_WITH_SRC := antithread \
+	antithread/alloc \
+	asort \
+	asprintf \
+	autodata \
+	avl \
+	bdelta \
+	block_pool \
+	btree \
+	ccan_tokenizer \
+	charset \
+	ciniparser \
+	crc \
+	crcsync \
+	daemonize \
+	daemon_with_notify \
+	dgraph \
+	err \
+	failtest \
+	foreach \
+	grab_file \
+	hash \
+	htable \
+	idtree \
+	ilog \
+	isaac \
+	iscsi \
+	json \
+	lbalance \
+	likely \
+	list \
+	md4 \
+	net \
+	noerr \
+	opt \
+	ptr_valid \
+	rbtree \
+	rbuf \
+	read_write_all \
+	rfc822 \
+	sparse_bsearch \
+	str \
+	stringmap \
+	strmap \
+	strset \
+	str_talloc \
+	take \
+	tal \
+	tal/link \
+	tal/path \
+	tal/str \
+	talloc \
+	talloc_link \
+	tally \
+	tap \
+	time \
+	ttxml
+
+MODS_NORMAL:=$(MODS_NORMAL_WITH_SRC) $(MODS_NORMAL_NO_SRC)
+
+# Modules which require external dependencies, thus may not pass check.
+MODS_EXTERNAL_NO_SRC:=
+
+MODS_EXTERNAL_WITH_SRC:=jmap \
+	jset \
+	nfs \
+	ogg_to_pcm \
+	wwviaudio
+
+MODS_EXTERNAL:=$(MODS_EXTERNAL_NO_SRC) $(MODS_EXTERNAL_WITH_SRC)
+
+MODS:=$(MODS_EXTERNAL) $(MODS_NORMAL)
+
+default: libccan.a
+
+# Automatic dependency generation: makes ccan/*/*.d files.
 DEPGEN=-MD
--include ccan/*.d
+-include ccan/*/*.d
+
+# Anything with C files needs building; dir leaves / on, sort uniquifies
+DIRS=$(patsubst %/, %, $(sort $(foreach m, $(MODS_NORMAL_WITH_SRC), $(dir $(wildcard ccan/$m/*.c)))))
+
+# Generate everyone's separate Makefiles.
+-include $(foreach dir, $(DIRS), $(dir)-Makefile)
 
-# Every directory with .c files (other than _info.c) is included.
-DIRS=$(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/[a-z]*.c))))
+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:
-	$(CC) $(CFLAGS) -c -o $@ $*/[a-z]*.c
+	$(LD) -r -o $@ $^
 
+libccan.a: $(OBJFILES)
+	$(AR) r $@ $(OBJFILES)