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

diff --git a/Makefile-ccan b/Makefile-ccan
index cbd9871c..5d04109e 100644
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -1,11 +1,24 @@
-# 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/*/[a-z]*.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)
 
-CFILES=$(wildcard ccan/*/[a-z]*.c)
-OBJFILES=$(CFILES:.c=.o)
+# Automatic dependency generation: makes ccan/*.d files.
+DEPGEN=-MD
+-include ccan/*/*.d
+
+# Every directory with .c files (other than _info.c) is included.
+DIRS=$(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/[a-z]*.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 [a-z]*.c && cd ../.. && $(LD) -r -o $@ `echo $*/[a-z]*.c ' ' | sed 's/\.c /.o /g'`
+