mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
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>
This commit is contained in:
parent
f5ac9a9495
commit
d917c98cd8
@ -98,6 +98,8 @@ $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFF
|
|||||||
rm -f libdevmapper.$(LIB_SUFFIX)
|
rm -f libdevmapper.$(LIB_SUFFIX)
|
||||||
$(LN_S) $< libdevmapper.$(LIB_SUFFIX)
|
$(LN_S) $< libdevmapper.$(LIB_SUFFIX)
|
||||||
|
|
||||||
|
CLEAN_TARGETS += libdevmapper.$(LIB_SUFFIX)
|
||||||
|
|
||||||
.PHONY: distclean_lib distclean
|
.PHONY: distclean_lib distclean
|
||||||
|
|
||||||
distclean_lib:
|
distclean_lib:
|
||||||
|
@ -25,5 +25,4 @@ ifeq ("@FSADM@", "yes")
|
|||||||
$(sbindir)/fsadm
|
$(sbindir)/fsadm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
distclean:
|
DISTCLEAN_TARGETS += clvmd_init_red_hat
|
||||||
$(RM) Makefile clvmd_init_red_hat
|
|
||||||
|
@ -82,7 +82,7 @@ LVMLIBS = -llvm-internal
|
|||||||
CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \
|
CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \
|
||||||
lvm2cmd.o lvm2cmd-static.o lvm2cmdlib.o lvm.static \
|
lvm2cmd.o lvm2cmd-static.o lvm2cmdlib.o lvm.static \
|
||||||
lvm.cflow lvm.xref lvm.tree lvm.rxref lvm.rtree \
|
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")
|
ifeq ("@CMDLIB@", "yes")
|
||||||
TARGETS += liblvm2cmd.$(LIB_SUFFIX)
|
TARGETS += liblvm2cmd.$(LIB_SUFFIX)
|
||||||
|
Loading…
Reference in New Issue
Block a user