Fix some clean rules, fix previous distclean checkin.

In libdm/Makefile.in, we need to cleanup the symlink properly.
Adding to CLEAN_TARGETS seemed like the simplest way to do this
in the current build framework.  We could redo dependencies for
VERSIONED_SHLIB, but for now just add to CLEAN_TARGETS.

For scripts/Makefile.in, we should be adding to DISTCLEAN_TARGETS.
The generic rule in make.tmpl.in takes care of the cleanup.

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Author: Takahiro Yasui <tyasui@redhat.com>

diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index e170b5c1d463d77e484e084ead400ec6324eca65..5283717d08a461ff3556a4fc5fd7817322d2f936 100644 (file)
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -98,6 +98,8 @@ $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFF
        rm -f libdevmapper.$(LIB_SUFFIX)
        $(LN_S) $< libdevmapper.$(LIB_SUFFIX)
 
+CLEAN_TARGETS += libdevmapper.$(LIB_SUFFIX)
+
 .PHONY: distclean_lib distclean
 
 distclean_lib:

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index f6ad7c2e6ee847fa3d797760cbf99de7a1690f8c..afd3916137b2b744ee9c9b8ec2ced491149e858a 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -25,5 +25,4 @@ ifeq ("@FSADM@", "yes")
                $(sbindir)/fsadm
 endif
 
-distclean:
-       $(RM) Makefile clvmd_init_red_hat
+DISTCLEAN_TARGETS += clvmd_init_red_hat

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 72ecd98a1e8ef098efdf64a8e8629edb92ea3dd4..fd67aff512a1d6ecc9ba74dbef2e93ff62605b0f 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -82,7 +82,7 @@ LVMLIBS = -llvm-internal
 CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \
                lvm2cmd.o lvm2cmd-static.o lvm2cmdlib.o lvm.static \
                lvm.cflow lvm.xref lvm.tree lvm.rxref lvm.rtree \
-               lvmcmdlib.o lvm-static.o dmsetup.o
+               lvmcmdlib.o lvm-static.o dmsetup.o dmsetup
 
 ifeq ("@CMDLIB@", "yes")
        TARGETS += liblvm2cmd.$(LIB_SUFFIX)