diff options
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | daemons/clvmd/Makefile.in | 2 | ||||
| -rw-r--r-- | liblvm/Makefile.in | 2 | ||||
| -rw-r--r-- | make.tmpl.in | 1 | ||||
| -rw-r--r-- | tools/Makefile.in | 2 |
5 files changed, 5 insertions, 3 deletions
@@ -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 905f1c94..40d1da46 100644 --- 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 25906e19..1b2b4745 100644 --- 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 5b8476f7..4b3ac172 100644 --- 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 41c20dba..efdf6991 100644 --- 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 \ |