[dm-devel] [PATCH] multipath-tools Makefiles: handle dependency files correctly

mwilck at suse.com mwilck at suse.com
Mon Mar 20 15:55:50 UTC 2023


From: Martin Wilck <mwilck at suse.com>

Some generated .d files were not correctly included, and not
removed with "make dep_clean". Fix it.

Reported-by: Xose Vazquez Perez <xose.vazquez at gmail.com>
Signed-off-by: Martin Wilck <mwilck at suse.com>
---
 libmultipath/Makefile | 4 ++--
 multipathd/Makefile   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libmultipath/Makefile b/libmultipath/Makefile
index 61aa611..85767ab 100644
--- a/libmultipath/Makefile
+++ b/libmultipath/Makefile
@@ -71,7 +71,7 @@ uninstall:
 clean: dep_clean
 	$(Q)$(RM) core *.a *.o *.so *.so.* *.abi nvme-ioctl.c nvme-ioctl.h autoconfig.h $(NV_VERSION_SCRIPT)
 
-include $(wildcard $(OBJS:.o=.d))
+include $(wildcard $(OBJS:.o=.d) $(OBJS-T:.o=.d))
 
 dep_clean:
-	$(Q)$(RM) $(OBJS:.o=.d)
+	$(Q)$(RM) $(OBJS:.o=.d) $(OBJS-T:.o=.d)
diff --git a/multipathd/Makefile b/multipathd/Makefile
index 9d53132..dca8e10 100644
--- a/multipathd/Makefile
+++ b/multipathd/Makefile
@@ -81,7 +81,7 @@ uninstall:
 clean: dep_clean
 	$(Q)$(RM) core *.o $(EXEC) $(CLI)
 
-include $(wildcard $(OBJS:.o=.d))
+include $(wildcard $(OBJS:.o=.d) $(CLI_OBJS:.o=.d))
 
 dep_clean:
-	$(Q)$(RM) $(OBJS:.o=.d)
+	$(Q)$(RM) $(OBJS:.o=.d) $(CLI_OBJS:.o=.d)
-- 
2.39.2



More information about the dm-devel mailing list