lib: simplify dependency generation

We don't need to run all the dependencies first, Make can do those in parallel.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>

diff --git a/lib/Makefile b/lib/Makefile
index eb83a72647d61b40f818543eb5029d67e49c17b9..17f2041c1110e38ebedab2a541e00e02d6f32acf 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -32,22 +32,15 @@ BEES_LDFLAGS = $(LDFLAGS)
 configure.h: configure.h.in
        $(TEMPLATE_COMPILER)
 
-.depends:
-       mkdir -p $@
-
-.depends/%.dep: %.cc configure.h Makefile | .depends
+%.dep: %.cc configure.h Makefile
        $(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
 
-depends.mk: $(CRUCIBLE_OBJS:%.o=.depends/%.dep)
-       cat $^ > $@.new
-       mv -f $@.new $@
+include $(CRUCIBLE_OBJS:%.o=%.dep)
 
 .version.cc: configure.h Makefile ../makeflags $(CRUCIBLE_OBJS:.o=.cc) ../include/crucible/*.h
        echo "namespace crucible { const char *VERSION = \"$(TAG)\"; }" > $@.new
        if ! cmp "$@.new" "$@"; then mv -fv $@.new $@; fi
 
-include depends.mk
-
 %.o: %.cc ../makeflags
        $(CXX) $(BEES_CXXFLAGS) -o $@ -c $<