hash: 64-bit hash functions should take 64-bit base.

[ccan] / Makefile-ccan

diff --git a/Makefile-ccan b/Makefile-ccan
index 68f7d02dd291948232441ad3e29d4acfb2265fd2..9b248a53fc27bb7392140a1fd1910203dbb392a4 100644 (file)
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -1,23 +1,32 @@
 # 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)
+#CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Werror -I. $(DEPGEN)
 
-# Automatic dependency generation: makes ccan/*.d files.
+default: libccan.a
+
+# Automatic dependency generation: makes ccan/*/*.d files.
 DEPGEN=-MD
--include ccan/*.d
+-include ccan/*/*.d
+
+# Every directory with .c files is included.
+DIRS=$(filter-out $(foreach d,$(EXCLUDE),ccan/$d), $(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/*.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)