public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/test/api Makefile.in
@ 2011-11-23 13:02 zkabelac
  0 siblings, 0 replies; 11+ messages in thread
From: zkabelac @ 2011-11-23 13:02 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-11-23 13:02:17

Modified files:
	test/api       : Makefile.in 

Log message:
	Put back devmapper-event linkage
	
	Older systems are not able to get this library from lvm2api library and need
	this library to be passed to the linker (i.e. Debian Lenny).

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

--- LVM2/test/api/Makefile.in	2011/11/23 12:21:41	1.23
+++ LVM2/test/api/Makefile.in	2011/11/23 13:02:17	1.24
@@ -28,7 +28,14 @@
 DEFS += -D_REENTRANT
 DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so $(top_builddir)/libdm/libdevmapper.so
 LDFLAGS += -L$(top_builddir)/liblvm
-LVMLIBS = @LVM2APP_LIB@ -ldevmapper $(LIBS)
+LVMLIBS = @LVM2APP_LIB@ -ldevmapper
+
+ifeq ("@DMEVENTD@", "yes")
+       LVMLIBS += -ldevmapper-event
+       LDFLAGS += -L$(top_builddir)/daemons/dmeventd
+endif
+
+LVMLIBS += $(LIBS)
 
 %.t: %.o $(DEPLIBS)
 	$(CC) -o $@ $(<) $(LDFLAGS) $(LVMLIBS)


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2011-03-01 21:30 zkabelac
  0 siblings, 0 replies; 11+ messages in thread
From: zkabelac @ 2011-03-01 21:30 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-03-01 21:30:43

Modified files:
	test/api       : Makefile.in 

Log message:
	Quick fix to compile lvm2api tests when possible
	
	Do not build lvm2api tests when lvm2api lib is not enabled.

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

--- LVM2/test/api/Makefile.in	2011/01/07 13:07:10	1.20
+++ LVM2/test/api/Makefile.in	2011/03/01 21:30:43	1.21
@@ -20,11 +20,14 @@
 endif
 
 TARGETS = 
+ifeq ("@APPLIB@", "yes")
+TARGETS += test
 test_SOURCES = test.c
 wrapper_SOURCES = test.c
 INCLUDES += -I../../include
 
-UNIT = vgtest.t percent.t
+TARGETS += vgtest.t percent.t
+endif
 
 LVMLIBS = @LVM2APP_LIB@ -ldevmapper
 DEPLIBS = $(top_builddir)/liblvm/liblvm2app.so $(top_builddir)/libdm/libdevmapper.so
@@ -44,9 +47,9 @@
 wrapper_OBJECTS = $(wrapper_SOURCES:.c=.o)
 OBJECTS = $(test_OBJECTS)
 
-all: tests test
+all: tests
 
-tests: $(UNIT)
+tests: $(TARGETS)
 
 test: $(test_OBJECTS) $(DEPLIBS)
 	$(CC) -o test $(test_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(READLINE_LIBS)


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2011-01-07 13:07 mornfall
  0 siblings, 0 replies; 11+ messages in thread
From: mornfall @ 2011-01-07 13:07 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2011-01-07 13:07:10

Modified files:
	test/api       : Makefile.in 

Log message:
	Remove *.t in test/api's make clean target.

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

--- LVM2/test/api/Makefile.in	2010/12/14 23:20:59	1.19
+++ LVM2/test/api/Makefile.in	2011/01/07 13:07:10	1.20
@@ -59,3 +59,6 @@
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status test/api/Makefile
+
+clean:
+	rm -f *.t


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2010-12-12 22:26 mornfall
  0 siblings, 0 replies; 11+ messages in thread
From: mornfall @ 2010-12-12 22:26 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2010-12-12 22:26:47

Modified files:
	test/api       : Makefile.in 

Log message:
	Remove a redundant %.o: %.c rule from test/api/Makefile.in.

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

--- LVM2/test/api/Makefile.in	2010/12/12 21:08:00	1.17
+++ LVM2/test/api/Makefile.in	2010/12/12 22:26:47	1.18
@@ -51,9 +51,6 @@
 test: $(test_OBJECTS) $(DEPLIBS)
 	$(CC) -o test $(test_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(READLINE_LIBS)
 
-%.o: $(srcdir)/%.c
-	$(CC) -o $@ $(CFLAGS) $(INCLUDES)
-
 %.t: %.o $(DEPLIBS)
 	$(CC) -o $@ $(<) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
 


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2010-12-12 20:49 mornfall
  0 siblings, 0 replies; 11+ messages in thread
From: mornfall @ 2010-12-12 20:49 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2010-12-12 20:49:38

Modified files:
	test/api       : Makefile.in 

Log message:
	Do not build vgtest (superseded by vgtest.t). Fix the build line for .t files.

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

--- LVM2/test/api/Makefile.in	2010/12/12 20:36:38	1.15
+++ LVM2/test/api/Makefile.in	2010/12/12 20:49:38	1.16
@@ -19,9 +19,8 @@
 	DEFS += -DDEBUG
 endif
 
-TARGETS = vgtest
+TARGETS = 
 test_SOURCES = test.c
-vgtest_SOURCES = vgtest.c
 wrapper_SOURCES = test.c
 INCLUDES += -I../../include
 
@@ -42,9 +41,8 @@
 endif
 
 test_OBJECTS = $(test_SOURCES:.c=.o)
-vgtest_OBJECTS = $(vgtest_SOURCES:.c=.o)
 wrapper_OBJECTS = $(wrapper_SOURCES:.c=.o)
-OBJECTS = $(test_OBJECTS) $(vgtest_OBJECTS)
+OBJECTS = $(test_OBJECTS)
 
 all: $(UNIT) test
 
@@ -52,7 +50,7 @@
 	$(CC) -o test $(test_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(READLINE_LIBS)
 
 %.o: $(srcdir)/%.c
-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(READLINE_LIBS)
+	$(CC) -o $@ $(CFLAGS) $(INCLUDES)
 
 %.t: %.o $(DEPLIBS)
 	$(CC) -o $@ $(<) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2010-04-14 16:13 wysochanski
  0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-04-14 16:13 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2010-04-14 16:13:34

Modified files:
	test/api       : Makefile.in 

Log message:
	Add missing readline linkage to lvm2app test.

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

--- LVM2/test/api/Makefile.in	2010/04/09 21:34:31	1.13
+++ LVM2/test/api/Makefile.in	2010/04/14 16:13:34	1.14
@@ -43,7 +43,7 @@
 OBJECTS = $(test_OBJECTS) $(vgtest_OBJECTS)
 
 test: $(test_OBJECTS) $(DEPLIBS)
-	$(CC) -o test $(test_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
+	$(CC) -o test $(test_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(READLINE_LIBS)
 
 vgtest: $(vgtest_OBJECTS) $(DEPLIBS)
 	$(CC) -o vgtest $(vgtest_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2009-11-30 15:12 mornfall
  0 siblings, 0 replies; 11+ messages in thread
From: mornfall @ 2009-11-30 15:12 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2009-11-30 15:12:34

Modified files:
	test/api       : Makefile.in 

Log message:
	Fix test/api to work with srcdir != builddir.

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

--- LVM2/test/api/Makefile.in	2009/10/02 19:10:38	1.10
+++ LVM2/test/api/Makefile.in	2009/11/30 15:12:34	1.11
@@ -26,17 +26,17 @@
 INCLUDES += -I../../include
 
 LVMLIBS = @LVM2APP_LIB@ -ldevmapper
-DEPLIBS = $(top_srcdir)/liblvm/liblvm2app.so $(top_srcdir)/libdm/libdevmapper.so
+DEPLIBS = $(top_builddir)/liblvm/liblvm2app.so $(top_builddir)/libdm/libdevmapper.so
 
 DEFS += -D_REENTRANT
 
-include $(top_srcdir)/make.tmpl
+include $(top_builddir)/make.tmpl
 
-LDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
+LDFLAGS = -L$(top_builddir)/libdm -L$(top_builddir)/liblvm
 
 ifeq ("@DMEVENTD@", "yes")
 	LVMLIBS += -ldevmapper-event -lpthread
-	LDFLAGS += -L$(top_srcdir)/daemons/dmeventd
+	LDFLAGS += -L$(top_builddir)/daemons/dmeventd
 endif
 
 test_OBJECTS = $(test_SOURCES:.c=.o)


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2009-09-04 13:49 wysochanski
  0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2009-09-04 13:49 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-09-04 13:49:02

Modified files:
	test/api       : Makefile.in 

Log message:
	Remove 'test' interative api unit tests from 'TARGET' line.
	
	The test/api directory TARGET line will be reserved for non-interactive
	unit tests.  Building the interactive test can still be done with "make test"
	from the test/api dir.

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

--- LVM2/test/api/Makefile.in	2009/07/21 13:51:05	1.7
+++ LVM2/test/api/Makefile.in	2009/09/04 13:49:02	1.8
@@ -19,7 +19,7 @@
 	DEFS += -DDEBUG
 endif
 
-TARGETS = test vgtest
+TARGETS = vgtest
 test_SOURCES = test.c
 vgtest_SOURCES = vgtest.c
 INCLUDES += -I${top_srcdir}/include


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2009-07-21 13:51 wysochanski
  0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2009-07-21 13:51 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-07-21 13:51:05

Modified files:
	test/api       : Makefile.in 

Log message:
	Fix build environment of test/api: Make it usable for more than one test case.
	
	Author: Thomas Woerner <twoerner@redhat.com>
	Committer: Dave Wysochanski <dwysocha@redhat.com>

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

--- LVM2/test/api/Makefile.in	2009/05/22 14:45:00	1.6
+++ LVM2/test/api/Makefile.in	2009/07/21 13:51:05	1.7
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.  
-# Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2009 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -10,31 +9,36 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SOURCES = test.c
-INCLUDES += -I${top_srcdir}/lib
-
 ifeq ("@DEBUG@", "yes")
 	DEFS += -DDEBUG
 endif
 
-TARGETS = test
+TARGETS = test vgtest
+test_SOURCES = test.c
+vgtest_SOURCES = vgtest.c
+INCLUDES += -I${top_srcdir}/include
 
 LVMLIBS = @LVM2APP_LIB@ -ldevmapper
+DEPLIBS = $(top_srcdir)/liblvm/liblvm2app.so $(top_srcdir)/libdm/libdevmapper.so
 
 DEFS += -D_REENTRANT
-CFLAGS += -fno-strict-aliasing
 
 include $(top_srcdir)/make.tmpl
 
 LDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
-CLDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
 
-test: $(OBJECTS) $(top_srcdir)/liblvm/liblvm2app.so $(top_srcdir)/libdm/libdevmapper.so
-	$(CC) -o test $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
+test_OBJECTS = $(test_SOURCES:.c=.o)
+vgtest_OBJECTS = $(vgtest_SOURCES:.c=.o)
+OBJECTS = $(test_OBJECTS) $(vgtest_OBJECTS)
+
+test: $(test_OBJECTS) $(DEPLIBS)
+	$(CC) -o test $(test_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
 
+vgtest: $(vgtest_OBJECTS) $(DEPLIBS)
+	$(CC) -o vgtest $(vgtest_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2009-04-28 19:08 wysochanski
  0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2009-04-28 19:08 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-04-28 19:08:25

Modified files:
	test/api       : Makefile.in 

Log message:
	Use liblvm.so instead of .a

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

--- LVM2/test/api/Makefile.in	2009/04/20 20:46:06	1.4
+++ LVM2/test/api/Makefile.in	2009/04/28 19:08:25	1.5
@@ -35,6 +35,6 @@
 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
+test: $(OBJECTS) $(top_srcdir)/liblvm/liblvm.so $(top_srcdir)/libdm/libdevmapper.so
 	$(CC) -o test $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
 


^ permalink raw reply	[flat|nested] 11+ messages in thread

* LVM2/test/api Makefile.in
@ 2009-04-20 20:46 wysochanski
  0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2009-04-20 20:46 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-04-20 20:46:06

Modified files:
	test/api       : Makefile.in 

Log message:
	Add libdevmapper to test/api building.

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

--- LVM2/test/api/Makefile.in	2009/03/08 17:29:27	1.3
+++ LVM2/test/api/Makefile.in	2009/04/20 20:46:06	1.4
@@ -25,7 +25,7 @@
 
 TARGETS = test
 
-LVMLIBS = -llvm
+LVMLIBS = -llvm -ldevmapper
 
 DEFS += -D_REENTRANT
 CFLAGS += -fno-strict-aliasing


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2011-11-23 13:02 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-23 13:02 LVM2/test/api Makefile.in zkabelac
  -- strict thread matches above, loose matches on Subject: below --
2011-03-01 21:30 zkabelac
2011-01-07 13:07 mornfall
2010-12-12 22:26 mornfall
2010-12-12 20:49 mornfall
2010-04-14 16:13 wysochanski
2009-11-30 15:12 mornfall
2009-09-04 13:49 wysochanski
2009-07-21 13:51 wysochanski
2009-04-28 19:08 wysochanski
2009-04-20 20:46 wysochanski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).