X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile-ccan;h=9b248a53fc27bb7392140a1fd1910203dbb392a4;hp=cbd9871cbec8cebfdbd9657caaa4263a4e51e3b2;hb=bbd7380019f3ea4629d170af24b902bf734c83ea;hpb=ad8da11f6d0664e0fb3c8707a869425088daea7e

diff --git a/Makefile-ccan b/Makefile-ccan
index cbd9871c..9b248a53 100644
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -1,11 +1,32 @@
-# Example makefile which makes a "libccan.a" of everything under ccan/
-# You could just do:
-#	SRCFILES += $(shell find ccan/ -name '[a-z]*.c')
+# Example makefile which makes a "libccan.a" of everything under ccan/.
+# For simple projects you could just do:
+#	SRCFILES += $(wildcard ccan/*/*.c)
 
-CFLAGS=-g -O2 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan -I.
+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)
 
-CFILES=$(wildcard ccan/*/[a-z]*.c)
-OBJFILES=$(CFILES:.c=.o)
+default: libccan.a
+
+# Automatic dependency generation: makes ccan/*/*.d files.
+DEPGEN=-MD
+-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)
+
+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)
+
+# We create all the .o files and link them together.
+$(OBJFILES): %.o:
+	$(LD) -r -o $@ $^
 
 libccan.a: $(OBJFILES)
-	$(AR) r $@ $^
+	$(AR) r $@ $(OBJFILES)