diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-03-19 16:12:10 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-03-19 23:21:18 +0100 |
| commit | e86798203e4d2775aa418db6a17b908de7e15130 (patch) | |
| tree | 24647c8b93305555bc0ea478a3b2233f6c8b651f | |
| parent | 48d04afaa2015fe285b2ae499b7f06d0b25ae00d (diff) | |
| download | lvm2-e86798203e4d2775aa418db6a17b908de7e15130.tar.gz | |
make: simplify dependency loading
No need for extra ifdefs around.
| -rw-r--r-- | libdm/make.tmpl.in | 8 | ||||
| -rw-r--r-- | make.tmpl.in | 8 |
2 files changed, 3 insertions, 13 deletions
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index 083fba9c3..549ef79d9 100644 --- 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 6f3f81915..75bb4f243 100644 --- 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 |