X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile-ccan;h=47249b90a0bc092c814219963b97ffd22e5809a9;hp=157f5d73548449b1692b7f74561b0613f48837c7;hb=4e2b7d0eed9fa1b98d5920393015b13fa06fedfa;hpb=480b3117c39b91fcb6d39c60222232b7608f5507

diff --git a/Makefile-ccan b/Makefile-ccan
index 157f5d73..47249b90 100644
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -6,108 +6,140 @@
 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)
 
-# Normal modules: no external dependencies, just a header:
-MODS_NORMAL_NO_SRC := alignof \
+MODS := a_star \
+	aga \
+	agar \
+	alignof \
+	altstack \
+	antithread \
+	antithread/alloc \
+	argcheck \
 	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 \
+	base64 \
 	bdelta \
+	bitmap \
 	block_pool \
+	breakpoint \
 	btree \
+	build_assert \
+	bytestring \
+	cast \
 	ccan_tokenizer \
+	cdump \
 	charset \
+	check_type \
 	ciniparser \
+	compiler \
+	container_of \
+	cppmagic \
+	cpuid \
 	crc \
 	crcsync \
+	crypto/ripemd160 \
+	crypto/sha256 \
+	crypto/shachain \
+	crypto/siphash24 \
 	daemonize \
 	daemon_with_notify \
+	darray \
+	deque \
 	dgraph \
+	endian \
+	eratosthenes \
 	err \
 	failtest \
 	foreach \
+	generator \
 	grab_file \
 	hash \
+	heap \
 	htable \
 	idtree \
 	ilog \
+	invbloom \
+	io \
 	isaac \
 	iscsi \
+	jacobson_karels \
+	jmap \
+	jset \
 	json \
 	lbalance \
 	likely \
 	list \
+	lpq \
+	lqueue \
+	lstack \
 	md4 \
+	mem \
+	minmax \
 	net \
+	nfs \
 	noerr \
+	ntdb \
+	objset \
+	ogg_to_pcm \
 	opt \
+	order \
+	permutation \
+	pipecmd \
+	pr_log \
+	ptrint \
 	ptr_valid \
+	pushpull \
 	rbtree \
 	rbuf \
 	read_write_all \
 	rfc822 \
+	rszshm \
+	short_types \
 	siphash \
 	sparse_bsearch \
 	str \
+	str/hex \
+	strgrp \
+	stringbuilder \
 	stringmap \
 	strmap \
 	strset \
-	str_talloc \
+	structeq \
 	take \
 	tal \
+	tal/grab_file \
 	tal/link \
 	tal/path \
+	tal/stack \
 	tal/str \
+	tal/talloc \
 	talloc \
-	talloc_link \
 	tally \
 	tap \
+	tcon \
 	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 \
-	tal/talloc \
-	wwviaudio
-
-MODS_EXTERNAL:=$(MODS_EXTERNAL_NO_SRC) $(MODS_EXTERNAL_WITH_SRC)
+	timer \
+	tlist \
+	tlist2 \
+	ttxml \
+	typesafe_cb \
+	version \
+	wwviaudio \
+	xstring
 
-MODS:=$(MODS_EXTERNAL) $(MODS_NORMAL)
+# Anything with C files needs building; dir leaves / on, sort uniquifies
+MODS_WITH_SRC = $(patsubst ccan/%/, %, $(sort $(foreach m, $(MODS), $(dir $(wildcard ccan/$m/*.c)))))
 
 default: libccan.a
 
 # Automatic dependency generation: makes ccan/*/*.d files.
-DEPGEN=-MD
--include ccan/*/*.d
+DEPGEN=-MMD
+-include $(foreach m, $(MODS), ccan/$(m)/*.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)))))
+DIRS=$(patsubst %, ccan/%, $(filter-out $(MODS_EXCLUDE), $(MODS_WITH_SRC)))
 
 # Generate everyone's separate Makefiles.
 -include $(foreach dir, $(DIRS), $(dir)-Makefile)