Makefile fixes: we now do dependencies properly for each ccan module.

diff --git a/Makefile b/Makefile
index ec3df8251bdf7002c7fd53ccc9ff76ff1a333246..e427c5d27b055412262ea6d044d34590aa3af410 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ libccan.a(%.o): ccan/%.o
 
 clean: tools-clean
        $(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name info` `find . -name '*.d'`
-       $(RM) inter-depends lib-depends test-depends
+       $(RM) inter-depends lib-depends test-depends ccan/*-Makefile
 
 # Creates a dependency from the tests to the object files which it needs.
 inter-depends: $(ALL_DEPENDS) Makefile

diff --git a/Makefile-ccan b/Makefile-ccan
index de669a0e7f0e482f7974ff266fc35498ab7ef170..e188e8a44569788ae951bbf977f9b863319fb261 100644 (file)
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -5,21 +5,28 @@
 #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
 
 # Every directory with .c files is included.
 DIRS=$(filter-out $(EXCLUDE), $(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)
 
-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'`
+       $(LD) -r -o $@ $^
 
+libccan.a: $(OBJFILES)
+       $(AR) r $@ $(OBJFILES)