shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

some makefile fixes for liblvm2cmd & remove some hardcoded .so

Browse Source
This commit is contained in:
Alasdair Kergon 2008-11-14 20:59:56 +00:00
parent a9145575f2
commit cee9a8d87e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libdm/Makefile.in
View File

@ -95,8 +95,8 @@ install_ioctl_static: ioctl/libdevmapper.a
$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX) $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
rm -f $@ rm -f $@
$(LN_S) $< $@ $(LN_S) $< $@
rm -f libdevmapper.so rm -f libdevmapper.$(LIB_SUFFIX)
$(LN_S) $< libdevmapper.so $(LN_S) $< libdevmapper.$(LIB_SUFFIX)
.PHONY: distclean_lib distclean .PHONY: distclean_lib distclean

18
tools/Makefile.in
View File

@ -79,13 +79,13 @@ endif
LVMLIBS = -llvm LVMLIBS = -llvm
CLEAN_TARGETS = liblvm2cmd.so 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
ifeq ("@CMDLIB@", "yes") ifeq ("@CMDLIB@", "yes")
TARGETS += liblvm2cmd.so TARGETS += liblvm2cmd.$(LIB_SUFFIX)
INSTALL_LVM_TARGETS += $(INSTALL_CMDLIB_TARGETS) INSTALL_LVM_TARGETS += $(INSTALL_CMDLIB_TARGETS)
endif endif
@ -129,7 +129,7 @@ liblvm2cmd-static.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd-s
cat $(top_srcdir)/lib/liblvm.a > $@ cat $(top_srcdir)/lib/liblvm.a > $@
$(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o $(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o
liblvm2cmd.so: liblvm2cmd.a $(LDDEPS) liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
.commands: commands.h cmdnames.h Makefile .commands: commands.h cmdnames.h Makefile
$(CC) -E -P cmdnames.h 2> /dev/null | \ $(CC) -E -P cmdnames.h 2> /dev/null | \
@ -155,17 +155,17 @@ lvm.tree: $(SOURCES)
cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref
endif endif
install_cmdlib_dynamic: liblvm2cmd.so install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
$(libdir)/liblvm2cmd.so.$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION_LVM)
$(LN_S) -f liblvm2cmd.so.$(LIB_VERSION) $(libdir)/liblvm2cmd.so $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION_LVM) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
$(includedir)/lvm2cmd.h $(includedir)/lvm2cmd.h
install_cmdlib_static: liblvm2cmd-static.a install_cmdlib_static: liblvm2cmd-static.a
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
$(libdir)/liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a.$(LIB_VERSION_LVM)
$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION_LVM) $(libdir)/liblvm2cmd.a
$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
$(includedir)/lvm2cmd.h $(includedir)/lvm2cmd.h