From f5ac9a94955066bbd8464ef0982486592510cade Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Mon, 16 Mar 2009 18:28:04 +0000 Subject: [PATCH] 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 --- Makefile.in | 4 +++- scripts/Makefile.in | 3 +++ test/Makefile.in | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 018e81264..d9c93d099 100644 --- 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 dabaf792f..f6ad7c2e6 100644 --- 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 ed66cb79a..aa4bab462 100644 --- 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: