hex: Simplify hex_encode

[ccan] / Makefile-ccan

diff --git a/Makefile-ccan b/Makefile-ccan
index 2e802dd5acbc50094f993d35309326536bda1ef1..47249b90a0bc092c814219963b97ffd22e5809a9 100644 (file)
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -2,23 +2,158 @@
 # 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.
-DEPGEN=-MD
--include ccan/*/*.d
+MODS := a_star \
+       aga \
+       agar \
+       alignof \
+       altstack \
+       antithread \
+       antithread/alloc \
+       argcheck \
+       array_size \
+       asearch \
+       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 \
+       structeq \
+       take \
+       tal \
+       tal/grab_file \
+       tal/link \
+       tal/path \
+       tal/stack \
+       tal/str \
+       tal/talloc \
+       talloc \
+       tally \
+       tap \
+       tcon \
+       time \
+       timer \
+       tlist \
+       tlist2 \
+       ttxml \
+       typesafe_cb \
+       version \
+       wwviaudio \
+       xstring
 
-# Every directory with .c files is included.
-DIRS=$(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/*.c))))
+# 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=-MMD
+-include $(foreach m, $(MODS), ccan/$(m)/*.d)
+
+DIRS=$(patsubst %, ccan/%, $(filter-out $(MODS_EXCLUDE), $(MODS_WITH_SRC)))
+
+# 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)