r815 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Wed May 19 12:41:18 2010
New Revision: 815

Log:
debian/patches/libs-cleanup.patch: Fix some other lib usages.

Modified:
   lvm2/trunk/debian/patches/libs-cleanup.patch

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Wed May 19 12:13:31 2010	(r814)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Wed May 19 12:41:18 2010	(r815)
@@ -107,3 +107,43 @@
  AC_SUBST(SNAPSHOTS)
  AC_SUBST(STATICDIR)
  AC_SUBST(STATIC_LINK)
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
+@@ -104,8 +104,6 @@
+ 	LVMLIBS += -ldevmapper-event
+ endif
+ 
+-LVMLIBS += -ldevmapper
+-
+ DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
+ 
+ CFLOW_LIST = lvmcmdlib.c lvm2cmd.c
+@@ -114,17 +112,17 @@
+ 
+ include $(top_builddir)/make.tmpl
+ 
+-LIBS += $(UDEV_LIBS)
++LIBS += -ldevmapper $(UDEV_LIBS)
+ 
+ device-mapper: $(TARGETS_DM)
+ 
+ dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
+-	      -o $@ dmsetup.o -ldevmapper $(LIBS)
++	      -o $@ dmsetup.o $(LIBS)
+ 
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
+-	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
++	      -o $@ dmsetup.o $(STATIC_LIBS) $(LIBS)
+ 
+ all: device-mapper
+ 
+@@ -144,6 +142,7 @@
+ 	cat $(top_builddir)/lib/liblvm-internal.a > $@
+ 	$(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o
+ 
++liblvm2cmd.$(LIB_SUFFIX): LIBS += $(DL_LIBS)
+ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
+ 
+ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)