LVM2 liblvm/Makefile.in test/api/Makefile.in

LVM2 liblvm/Makefile.in test/api/Makefile.in

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-09-14 22:56:27

Modified files:
	liblvm         : Makefile.in 
	test/api       : Makefile.in 

Log message:
	Fix build failure when enabling dmeventd and applib.
	
	This patch fixes a build with options similar to the following:
	./configure --enable-debug --enable-applib --enable-dmeventd --enable-cmdlib

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/liblvm/Makefile.in.diff?cvsroot=lvm2&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/api/Makefile.in.diff?cvsroot=lvm2&r1=1.8&r2=1.9

--- LVM2/liblvm/Makefile.in	2009/09/03 18:19:07	1.15
+++ LVM2/liblvm/Makefile.in	2009/09/14 22:56:27	1.16
@@ -42,6 +42,10 @@
 
 LIBS += -ldevmapper -llvm-internal
 
+ifeq ("@DMEVENTD@", "yes")
+  LIBS += -ldevmapper-event
+endif
+
 $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_APP): %.$(LIB_SUFFIX)
 	rm -f $@
 	$(LN_S) $< $@
--- LVM2/test/api/Makefile.in	2009/09/04 13:49:02	1.8
+++ LVM2/test/api/Makefile.in	2009/09/14 22:56:27	1.9
@@ -33,6 +33,11 @@
 
 LDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
 
+ifeq ("@DMEVENTD@", "yes")
+	LVMLIBS += -ldevmapper-event -lpthread
+	LDFLAGS += -L$(top_srcdir)/daemons/dmeventd
+endif
+
 test_OBJECTS = $(test_SOURCES:.c=.o)
 vgtest_OBJECTS = $(vgtest_SOURCES:.c=.o)
 OBJECTS = $(test_OBJECTS) $(vgtest_OBJECTS)

LVM2 liblvm/Makefile.in test/api/Makefile.in

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-03-08 17:29:27

Modified files:
	liblvm         : Makefile.in 
	test/api       : Makefile.in 

Log message:
	Remove unnecessary linker flags for liblvm.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/liblvm/Makefile.in.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/api/Makefile.in.diff?cvsroot=lvm2&r1=1.2&r2=1.3

--- LVM2/liblvm/Makefile.in	2009/03/08 17:06:55	1.2
+++ LVM2/liblvm/Makefile.in	2009/03/08 17:29:26	1.3
@@ -29,7 +29,6 @@
 
 include $(top_srcdir)/make.tmpl
 
-CLDFLAGS += -z now
 LIBS += -ldevmapper -llvm-internal
 
 $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): $(interface)/%.$(LIB_SUFFIX)
--- LVM2/test/api/Makefile.in	2009/03/08 17:06:56	1.2
+++ LVM2/test/api/Makefile.in	2009/03/08 17:29:27	1.3
@@ -25,7 +25,7 @@
 
 TARGETS = test
 
-LVMLIBS = -llvm -ldevmapper
+LVMLIBS = -llvm
 
 DEFS += -D_REENTRANT
 CFLAGS += -fno-strict-aliasing

LVM2 liblvm/Makefile.in test/api/Makefile.in

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-03-08 17:06:56

Modified files:
	liblvm         : Makefile.in 
	test/api       : Makefile.in 

Log message:
	Add DSO generation for new LVM application library.
	
	Fix test/api/test build.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/liblvm/Makefile.in.diff?cvsroot=lvm2&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/api/Makefile.in.diff?cvsroot=lvm2&r1=1.1&r2=1.2

--- LVM2/liblvm/Makefile.in	2009/03/06 16:19:53	1.1
+++ LVM2/liblvm/Makefile.in	2009/03/08 17:06:55	1.2
@@ -19,14 +19,25 @@
 SOURCES =\
 	lvm_base.c
 
-LIB_STATIC = liblvm.a
+LIB_NAME = liblvm
+LIB_VERSION = $(LIB_VERSION_LVM)
 
-$(SUBDIRS): $(LIB_STATIC)
+LIB_STATIC = $(LIB_NAME).a
+LIB_SHARED = $(LIB_NAME).so
 
 CLEAN_TARGETS += liblvm.cflow
 
 include $(top_srcdir)/make.tmpl
 
+CLDFLAGS += -z now
+LIBS += -ldevmapper -llvm-internal
+
+$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): $(interface)/%.$(LIB_SUFFIX)
+	rm -f $@
+	$(LN_S) $< $@
+	rm -f $(LIB_NAME).$(LIB_SUFFIX)
+	$(LN_S) $< $(LIB_NAME).$(LIB_SUFFIX)
+
 liblvm.cflow: $(SOURCES)
 	set -e; (echo -n "SOURCES += "; \
 		 echo $(SOURCES) | \
--- LVM2/test/api/Makefile.in	2008/12/07 19:37:07	1.1
+++ LVM2/test/api/Makefile.in	2009/03/08 17:06:56	1.2
@@ -30,10 +30,11 @@
 DEFS += -D_REENTRANT
 CFLAGS += -fno-strict-aliasing
 
-LDFLAGS += -L$(top_srcdir)/api/lib
-
 include $(top_srcdir)/make.tmpl
 
-test: $(OBJECTS) $(top_srcdir)/lib/liblvm.a $(top_srcdir)/libdm/libdevmapper.so
+LDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
+CLDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
+
+test: $(OBJECTS) $(top_srcdir)/liblvm/liblvm.a $(top_srcdir)/libdm/libdevmapper.so
 	$(CC) -o test $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)