From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4392 invoked by alias); 1 Mar 2011 21:30:45 -0000 Received: (qmail 4375 invoked by uid 9737); 1 Mar 2011 21:30:44 -0000 Date: Tue, 01 Mar 2011 21:30:00 -0000 Message-ID: <20110301213044.4373.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test/api Makefile.in Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2011-03/txt/msg00001.txt.bz2 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)