Fix Makefile to take into account dmsetup's reconfiguration.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 73398a588d01fbe75bf5c450c32db0119ddff34b..670603ff511b98e85ae9cc667dfdec0c6162f1cb 100644 (file)
--- 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 3902303bf6fca87f83f31fe7947c0f3280f7a2e8..5fbd319bfe54ec1931ec06dd62be9a1ec959187d 100644 (file)
--- 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 7cdcb3891f5f63515d6a8c8d3d58f7923529eb87..08106112abf212b093da23679025adf22171eb19 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -62,6 +62,9 @@ SOURCES =\
        vgscan.c \
        vgsplit.c
 
+SOURCES2 =\
+       dmsetup.c
+
 TARGETS =\
        .commands \
        lvm