Makefile: fix dependency generation

- Don't regenerate make.deps for 'make clean' target
- Place the dependency on make.deps at the correct level; all "%.o"
  generations depend on it, not the top-level 'all' target

diff --git a/Makefile b/Makefile
index 523709f011209b8d1e52033fa5b2dd1971326a1c..c363876dfd3fef30a0f2a3ecef3832949854c023 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,12 +21,15 @@ program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
 program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
 DEPS = make.deps
 
-all: $(LIB_SO) $(DEPS) tests
+all: $(LIB_SO) tests
 
+$(DEPS): build_deps := 1
 $(DEPS): $(program_C_SRCS) $(program_H_SRCS)
        $(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
 
+ifeq ($(build_deps),1)
 include $(DEPS)
+endif
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -41,7 +44,7 @@ $(LIB_SO): $(OBJECTS)
 malloc.o: malloc.c
        $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
-%.o: %.cc
+%.o: %.cc $(DEPS)
        $(CXX) -fPIC -c $< $(CPPFLAGS)
 
 PHONY += clean