mirror of
git://sourceware.org/git/lvm2.git
synced 2025-02-27 01:57:55 +03:00
Add liblvm2app Makefile installation targets.
Add liblvm pkgconfig file.
This commit is contained in:
parent
90d8fab02e
commit
44482a809e
@ -1,5 +1,7 @@
|
||||
Version 2.02.50 -
|
||||
================================
|
||||
Add liblvm2app Makefile installation targets.
|
||||
Add liblvm pkgconfig file.
|
||||
Use newly-independent LVM_LIBAPI in liblvm soname. E.g. liblvm2app.so.2.1.
|
||||
Add an API version number, LVM_LIBAPI, to the VERSION string for liblvm.
|
||||
Pass a pointer to struct cmd_context to init_multiple_segtypes
|
||||
|
3
configure
vendored
3
configure
vendored
@ -12685,7 +12685,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
|
||||
|
||||
|
||||
################################################################################
|
||||
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile"
|
||||
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@ -13305,6 +13305,7 @@ do
|
||||
"libdm/Makefile") CONFIG_FILES="$CONFIG_FILES libdm/Makefile" ;;
|
||||
"libdm/libdevmapper.pc") CONFIG_FILES="$CONFIG_FILES libdm/libdevmapper.pc" ;;
|
||||
"liblvm/Makefile") CONFIG_FILES="$CONFIG_FILES liblvm/Makefile" ;;
|
||||
"liblvm/liblvm2app.pc") CONFIG_FILES="$CONFIG_FILES liblvm/liblvm2app.pc" ;;
|
||||
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
|
||||
"po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
|
||||
"scripts/clvmd_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/clvmd_init_red_hat" ;;
|
||||
|
@ -852,6 +852,7 @@ lib/snapshot/Makefile
|
||||
libdm/Makefile
|
||||
libdm/libdevmapper.pc
|
||||
liblvm/Makefile
|
||||
liblvm/liblvm2app.pc
|
||||
man/Makefile
|
||||
po/Makefile
|
||||
scripts/clvmd_init_red_hat
|
||||
|
@ -25,9 +25,14 @@ LIB_VERSION = $(LIB_VERSION_APP)
|
||||
VERSIONED_SHLIB = $(LIB_NAME).$(LIB_SUFFIX).$(LIB_VERSION_APP)
|
||||
|
||||
ifeq ("@STATIC_LINK@", "yes")
|
||||
LIB_STATIC = $(LIB_NAME).a
|
||||
LIB_STATIC = $(LIB_NAME).a
|
||||
endif
|
||||
|
||||
ifeq ("@LIB_SUFFIX@","dylib")
|
||||
LIB_SHARED = $(LIB_NAME).dylib
|
||||
else
|
||||
LIB_SHARED = $(LIB_NAME).so
|
||||
endif
|
||||
LIB_SHARED = $(LIB_NAME).so
|
||||
|
||||
CLEAN_TARGETS += liblvm.cflow
|
||||
|
||||
@ -35,10 +40,43 @@ include $(top_srcdir)/make.tmpl
|
||||
|
||||
LIBS += -ldevmapper -llvm-internal
|
||||
|
||||
$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): %.$(LIB_SUFFIX)
|
||||
$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_APP): %.$(LIB_SUFFIX)
|
||||
rm -f $@
|
||||
$(LN_S) $< $@
|
||||
|
||||
.PHONY: install_dynamic install_static install_include install_pkgconfig \
|
||||
distclean_lib distclean
|
||||
|
||||
INSTALL_TYPE = install_dynamic
|
||||
|
||||
ifeq ("@STATIC_LINK@", "yes")
|
||||
INSTALL_TYPE += install_static
|
||||
endif
|
||||
|
||||
ifeq ("@PKGCONFIG@", "yes")
|
||||
INSTALL_TYPE += install_pkgconfig
|
||||
endif
|
||||
|
||||
install: $(INSTALL_TYPE) install_include
|
||||
|
||||
install_include:
|
||||
$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm.h $(includedir)/lvm.h
|
||||
|
||||
install_dynamic: $(LIB_SHARED)
|
||||
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
|
||||
$(libdir)/$(LIB_SHARED).$(LIB_VERSION_APP)
|
||||
$(LN_S) -f $(LIB_SHARED).$(LIB_VERSION_APP) \
|
||||
$(libdir)/$(LIB_SHARED)
|
||||
|
||||
install_static: $(LIB_STATIC)
|
||||
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
|
||||
$(libdir)/$(LIB_STATIC).$(LIB_VERSION_APP)
|
||||
$(LN_S) -f $(LIB_STATIC).$(LIB_VERSION_APP) $(libdir)/$(LIB_STATIC)
|
||||
|
||||
install_pkgconfig:
|
||||
$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(LIB_NAME).pc \
|
||||
$(usrlibdir)/pkgconfig/$(LIB_NAME).pc
|
||||
|
||||
liblvm.cflow: $(SOURCES)
|
||||
set -e; (echo -n "SOURCES += "; \
|
||||
echo $(SOURCES) | \
|
||||
@ -46,3 +84,10 @@ liblvm.cflow: $(SOURCES)
|
||||
) > $@
|
||||
|
||||
cflow: liblvm.cflow
|
||||
|
||||
CLEAN_TARGETS += $(LIB_NAME).$(LIB_SUFFIX)
|
||||
|
||||
distclean_lib:
|
||||
$(RM) $(LIB_NAME).pc
|
||||
|
||||
distclean: distclean_lib
|
||||
|
11
liblvm/liblvm2app.pc
Normal file
11
liblvm/liblvm2app.pc
Normal file
@ -0,0 +1,11 @@
|
||||
prefix=/usr
|
||||
exec_prefix=
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: lvm2app
|
||||
Description: lvm2 application library
|
||||
Version: 2.1
|
||||
Cflags: -I${includedir}
|
||||
Libs: -L${libdir} -llvm2app
|
||||
Libs.private: -ldevmapper
|
Loading…
x
Reference in New Issue
Block a user