makefiles: deps also for cxx

Generate deps also for .cxx.
Remove include dir deps - there is nothing to build.

diff --git a/Makefile.in b/Makefile.in
index 5dd642f63a376c1e005bcae4bcfa7c449f37c752..4dceaba1d0cac0268b13d544db9ee18cef94a2cf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,8 +47,6 @@ include $(top_srcdir)/base/Makefile
 include $(top_srcdir)/device_mapper/Makefile
 include $(top_srcdir)/test/unit/Makefile
 
-libdm: include
-libdaemon: include
 lib: libdaemon $(BASE_TARGET) $(DEVICE_MAPPER_TARGET)
 daemons: lib libdaemon tools
 scripts: lib
@@ -59,11 +57,8 @@ all_man: tools
 test: tools daemons
 unit-test  run-unit-test: test
 
-lib.device-mapper: include.device-mapper
-libdm.device-mapper: include.device-mapper
 daemons.device-mapper: libdm.device-mapper
 tools.device-mapper: libdm.device-mapper
-scripts.device-mapper: include.device-mapper
 device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
 device_mapper: device-mapper
 

diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index f7a5a7a73616749107bf56a1c4d0748f29740164..a306101d5b58de42c39daaaac6c7bc213cf769b0 100644 (file)
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -403,7 +403,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
 %.o: %.cpp $(DEPS)
        @echo "    [CXX] $(<F)"
        @mkdir -p $(@D)
-       $(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
+       $(Q) $(CXX) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
 
 %.pot: %.c $(DEPS)
        @echo "    [CC] $@"

diff --git a/make.tmpl.in b/make.tmpl.in
index 73bf298c706fedf6983f8bfeb0d8c5975496eb7c..6145b0bd5b6557b6af08db33b0a34b084435c3a3 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -454,7 +454,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
 %.o: %.cpp $(DEPS)
        @echo "    [CXX] $(<F)"
        @mkdir -p $(@D)
-       $(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
+       $(Q) $(CXX) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
 
 %.pot: %.c $(DEPS)
        @echo "    [CC] $(<F)"