make: simplify dependency loading

No need for extra ifdefs around.

diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index 083fba9c30a7da06eb9411a081d6921280feff07..549ef79d9091cd3103aa871c1ada2383bf400d92 100644 (file)
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -530,11 +530,7 @@ endif
 ifeq ("@USE_TRACKING@","yes")
 ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \
  help check check_local check_cluster check_lvmpolld))
-    ifdef SOURCES
-       -include $(SOURCES:.c=.d) $(CXXSOURCES:.cpp=.d)
-    endif
-    ifdef SOURCES2
-       -include $(SOURCES2:.c=.d)
-    endif
+# Note: no tabs before -include
+    -include $(SOURCES:.c=.d) $(SOURCES2:.c=.d) $(CXXSOURCES:.cpp=.d)
 endif
 endif

diff --git a/make.tmpl.in b/make.tmpl.in
index 6f3f8191591768e99fe3803a0a105ad914ed92e8..75bb4f243dd4af2a1b263a79ccacea3b5e65c7bb 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -570,12 +570,6 @@ ifeq ("$(USE_TRACKING)","yes")
 ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \
  help check check_local check_cluster check_lvmpolld run-unit-test tags))
 # Note: no tabs before -include
-    ifdef SOURCES
-       -include $(SOURCES:.c=.d) $(CXXSOURCES:.cpp=.d)
-    endif
-    ifdef SOURCES2
-       -include $(SOURCES2:.c=.d)
-    endif
-    DEPENDS = yes
+    -include $(SOURCES:.c=.d) $(SOURCES2:.c=.d) $(CXXSOURCES:.cpp=.d)
 endif
 endif