From 1b611e7cd873f8cb6527c8589b4ad775cc10f90a Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Tue, 21 Jul 2009 13:51:05 +0000 Subject: [PATCH] Fix build environment of test/api: Make it usable for more than one test case. Author: Thomas Woerner Committer: Dave Wysochanski --- test/api/Makefile.in | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/test/api/Makefile.in b/test/api/Makefile.in index 11eb1a509..e59696b25 100644 --- a/test/api/Makefile.in +++ b/test/api/Makefile.in @@ -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) -- 2.43.5