X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile-ccan;h=31ad2e425237b405678127b9ff09a27cb7f530f1;hp=59d540b4a0d6b2a5d80ad7962049d54cb6774636;hb=2512fecb742a1cfd0ce31d81c98bba0a97f3cbe2;hpb=dca596459198ea77f35e4b6e767453fa5a7e1318

diff --git a/Makefile-ccan b/Makefile-ccan
index 59d540b4..31ad2e42 100644
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -2,17 +2,145 @@
 # 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)
-CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -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)
+
+# Modules which are just a header:
+MODS_NO_SRC := alignof \
+	argcheck \
+	array_size \
+	asearch \
+	bitmap \
+	build_assert \
+	cast \
+	check_type \
+	compiler \
+	container_of \
+	cppmagic \
+	darray \
+	endian \
+	lqueue \
+	lstack \
+	minmax \
+	objset \
+	short_types \
+	structeq \
+	tcon \
+	tlist \
+	typesafe_cb \
+	version
+
+# No external dependencies, with C code:
+MODS_WITH_SRC := a_star \
+	aga \
+	agar \
+	altstack \
+	antithread \
+	antithread/alloc \
+	asort \
+	asprintf \
+	autodata \
+	avl \
+	base64 \
+	bdelta \
+	block_pool \
+	breakpoint \
+	btree \
+	bytestring \
+	ccan_tokenizer \
+	cdump \
+	charset \
+	ciniparser \
+	crc \
+	crcsync \
+	cpuid \
+	crypto/ripemd160 \
+	crypto/sha256 \
+	crypto/shachain \
+	daemonize \
+	daemon_with_notify \
+	deque \
+	dgraph \
+	eratosthenes \
+	err \
+	failtest \
+	foreach \
+	generator \
+	grab_file \
+	hash \
+	heap \
+	htable \
+	idtree \
+	ilog \
+	invbloom \
+	io \
+	isaac \
+	iscsi \
+	jacobson_karels \
+	jmap \
+	json \
+	jset \
+	lbalance \
+	likely \
+	list \
+	lpq \
+	md4 \
+	mem \
+	net \
+	nfs \
+	noerr \
+	ntdb \
+	ogg_to_pcm \
+	opt \
+	order \
+	permutation \
+	pipecmd \
+	pr_log \
+	ptrint \
+	ptr_valid \
+	pushpull \
+	rbtree \
+	rbuf \
+	read_write_all \
+	rfc822 \
+	rszshm \
+	siphash \
+	sparse_bsearch \
+	str \
+	str/hex \
+	stringbuilder \
+	stringmap \
+	strgrp \
+	strmap \
+	strset \
+	take \
+	tal \
+	tal/grab_file \
+	tal/link \
+	tal/path \
+	tal/stack \
+	tal/str \
+	tal/talloc \
+	talloc \
+	tally \
+	tap \
+	time \
+	timer \
+	ttxml \
+	wwviaudio \
+	xstring
+
+MODS:=$(MODS_WITH_SRC) $(MODS_NO_SRC)
 
 default: libccan.a
 
 # Automatic dependency generation: makes ccan/*/*.d files.
-DEPGEN=-MD
--include ccan/*/*.d
+DEPGEN=-MMD
+-include $(foreach m, $(MODS), ccan/$(m)/*.d)
 
-# Every directory with .c files is included.
-DIRS=$(filter-out $(foreach d,$(EXCLUDE),ccan/$d), $(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)