From 3eca5ad9a1ef851c897d4de38d258dfa758fb732 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Fri, 11 Sep 2009 15:52:22 +0000 Subject: [PATCH] Fix Makefile to take into account dmsetup's reconfiguration. --- WHATS_NEW_DM | 1 + make.tmpl.in | 7 +++++-- tools/Makefile.in | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 73398a588..670603ff5 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.37 - ================================= + Fix Makefile to take into account dmsetup's reconfiguration. Restore umask when device node creation fails. Fix mirror table CTR code to handle 'block_on_error' and 'cluster' features diff --git a/make.tmpl.in b/make.tmpl.in index 3902303bf..5fbd319bf 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -239,14 +239,14 @@ $(LIB_STATIC): $(OBJECTS) clean: $(SUBDIRS.clean) $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \ - $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \ + $(SOURCES2:%.c=%.d) $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \ $(SOURCES:%.c=%.gcda) $(LDDEPS) distclean: $(SUBDIRS.distclean) $(RM) -rf $(DISTCLEAN_DIRS) $(RM) $(DISTCLEAN_TARGETS) \ $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \ - $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \ + $(SOURCES2:%.c=%.d) $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \ $(SOURCES:%.c=%.gcda) $(LDDEPS) \ config.cache config.log config.status \ Makefile make.tmpl core \ @@ -262,6 +262,9 @@ ifneq ($(MAKECMDGOALS),clean) ifdef SOURCES -include $(SOURCES:.c=.d) endif + ifdef SOURCES2 + -include $(SOURCES2:.c=.d) + endif endif endif diff --git a/tools/Makefile.in b/tools/Makefile.in index 7cdcb3891..08106112a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -62,6 +62,9 @@ SOURCES =\ vgscan.c \ vgsplit.c +SOURCES2 =\ + dmsetup.c + TARGETS =\ .commands \ lvm -- 2.43.5