X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile-ccan;h=2e802dd5acbc50094f993d35309326536bda1ef1;hp=0396ac22c1fe4410399279e7e1dd900b4160eeef;hb=6d35d746f123291ba93a592997dcd5b6fe7828cf;hpb=3fb9ac9349703401a6b2c3e969f3bc9bdb9d1eae;ds=sidebyside

diff --git a/Makefile-ccan b/Makefile-ccan
index 0396ac22..2e802dd5 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/*/*.c)
 
-CFLAGS=-g -O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -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 is included.
+DIRS=$(patsubst %/, %, $(sort $(dir $(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'`
+