X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile-ccan;h=2e802dd5acbc50094f993d35309326536bda1ef1;hp=68f7d02dd291948232441ad3e29d4acfb2265fd2;hb=bcf7916c5d694858766869dfd570e525127154a6;hpb=9d724ba2aa3b69cc56d20e5f578b2c1399e965f6

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