Introduce LVMINTERNAL_LIBS

Keep dependency libraries for liblvm-internal in one place.

diff --git a/WHATS_NEW b/WHATS_NEW
index 162bcc7aff314d4570ea2638056d17252feadac0..3b9e89de25102a64a3cc33d1df126bef3be43634 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.62 -
 ====================================
+  Define and use internal makefile variable LVMINTERNAL_LIBS.
   Help for configure prints --disable-fsadm.
   Use consistently $() instead of ${} for all Makefile variables.
   Replace CFLOW_CMD only in make.tmpl and use it as variable elsewhere.

diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in
index 905f1c94e6a5ab5da84da052a179a87215d38c15..40d1da46b7a6deed6e527a5fbb02a1273ebd6563 100644 (file)
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
@@ -75,7 +75,7 @@ endif
 TARGETS = \
        clvmd
 
-LVMLIBS = -llvm-internal -lpthread
+LVMLIBS = $(LVMINTERNAL_LIBS) -lpthread
 
 ifeq ("@DMEVENTD@", "yes")
        LVMLIBS += -ldevmapper-event

diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in
index 25906e198e655eda386df6417ccdb2990cd4768e..1b2b474533a988b991a4a111da949ae0c9cfacd7 100644 (file)
--- a/liblvm/Makefile.in
+++ b/liblvm/Makefile.in
@@ -42,7 +42,7 @@ CLEAN_TARGETS += liblvm.cflow
 
 include $(top_builddir)/make.tmpl
 
-LIBS += -ldevmapper -llvm-internal
+LIBS += $(LVMINTERNAL_LIBS) -ldevmapper
 
 ifeq ("@DMEVENTD@", "yes")
   LIBS += -ldevmapper-event

diff --git a/make.tmpl.in b/make.tmpl.in
index 5b8476f79de8ca5ba792940ded895a5ed3214796..4b3ac172b046570f77b47da1053064eca8184213 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -36,6 +36,7 @@ CLDFLAGS += @CLDFLAGS@
 LDDEPS += @LDDEPS@
 LDFLAGS += @LDFLAGS@
 LIB_SUFFIX = @LIB_SUFFIX@
+LVMINTERNAL_LIBS = -llvm-internal
 
 # Setup directory variables
 prefix = @prefix@

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 41c20dbadd9fe87ba57dfa9e1fbe4796deb30740..efdf6991ce45ed19007a1667a754518c2ed92b57 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -86,7 +86,7 @@ ifeq ("@STATIC_LINK@", "yes")
   INSTALL_CMDLIB_TARGETS += install_cmdlib_static
 endif
 
-LVMLIBS = -llvm-internal
+LVMLIBS = $(LVMINTERNAL_LIBS)
 LIB_VERSION = $(LIB_VERSION_LVM)
 
 CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \