Fix some distclean rules.

By gnu coding stds, 'distclean' should remove all files generated
by ./configure in addition to what 'clean' does.

Author: Takahiro Yasui <tyasui@redhat.com>

diff --git a/Makefile.in b/Makefile.in
index 018e8126428abfc56e23c7529125eab05fa2299a..d9c93d09930d079db05bcf523b6fb75bab8e75b4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,14 +27,16 @@ SUBDIRS += lib tools daemons libdm liblvm
 ifeq ($(MAKECMDGOALS),distclean)
   SUBDIRS += daemons/clvmd \
             daemons/dmeventd/plugins \
+            daemons/dmeventd \
             lib/format1 \
             lib/format_pool \
             lib/locking \
             lib/mirror \
             lib/snapshot \
+            test/api \
             test \
             po
-  DISTCLEAN_TARGETS += lib/misc/configure.h
+  DISTCLEAN_TARGETS += lib/misc/configure.h lib/misc/lvm-version.h
   DISTCLEAN_DIRS += lcov_reports*
 endif
 

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index dabaf792fc18a7d8bfe2c0c64507529f307d8fee..f6ad7c2e6ee847fa3d797760cbf99de7a1690f8c 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -24,3 +24,6 @@ ifeq ("@FSADM@", "yes")
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm.sh \
                $(sbindir)/fsadm
 endif
+
+distclean:
+       $(RM) Makefile clvmd_init_red_hat

diff --git a/test/Makefile.in b/test/Makefile.in
index ed66cb79a984ed82b9532bbdee2b8162a5ace158..aa4bab4621802e852c46ad5163d8a4f105c12036 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -81,6 +81,7 @@ clean:
        rm -rf init.sh lvm-wrapper bin .bin-dir-stamp
 
 distclean: clean
+       rm -f Makefile
 
 .PHONY: $(T) clean distclean
 .NOTPARALLEL: