From 2f5ed5e8267267eac2531e8072d76cdf6ce929f2 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Thu, 3 Sep 2009 10:58:05 +0400 Subject: [PATCH 2/2] Fix liblvm2cmd linking. --- LVM2/make.tmpl.in | 5 +++-- LVM2/tools/Makefile.in | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/LVM2/make.tmpl.in b/LVM2/make.tmpl.in index eb9ccf2..ba7a69d 100644 --- a/LVM2/make.tmpl.in +++ b/LVM2/make.tmpl.in @@ -219,8 +219,9 @@ endif %.so: %.a $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \ - $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \ - @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ + $(CFLAGS) $(CLDFLAGS) -o $@ \ + @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ \ + $(LIBS) $(LIB_STATIC): $(OBJECTS) $(RM) $@ diff --git a/LVM2/tools/Makefile.in b/LVM2/tools/Makefile.in index 7cdcb38..eb43b59 100644 --- a/LVM2/tools/Makefile.in +++ b/LVM2/tools/Makefile.in @@ -133,6 +133,7 @@ liblvm2cmd-static.a: $(top_srcdir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o cat $(top_srcdir)/lib/liblvm-internal.a > $@ $(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o +liblvm2cmd.$(LIB_SUFFIX): LIBS += -ldevmapper -llvm-internal -ldl -ldevmapper-event liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS) .commands: commands.h cmdnames.h Makefile -- 1.6.4.2