Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r588393 - /apr/apr/branches/1.2.x/test/Makefile.in
Date: Thu, 25 Oct 2007 23:49:34 -0000
To: commits@apr.apache.org
From: wrowe@apache.org
Message-Id: <20071025234934.D69E61A9832@eris.apache.org>

Author: wrowe
Date: Thu Oct 25 16:49:33 2007
New Revision: 588393

URL: http://svn.apache.org/viewvc?rev=588393&view=rev
Log:
Reorganize similar-to-trunk, using much more shorthand to make the build
rules easier to read.

Modified:
    apr/apr/branches/1.2.x/test/Makefile.in

Modified: apr/apr/branches/1.2.x/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/Makefile.in?rev=588393&r1=588392&r2=588393&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/Makefile.in (original)
+++ apr/apr/branches/1.2.x/test/Makefile.in Thu Oct 25 16:49:33 2007
@@ -4,6 +4,8 @@
 # PROGRAMS includes all test programs built on this platform.
 # STDTEST_PORTABLE
 #   test programs invoked via standard user interface, run on all platforms
+# TESTS
+#   test modules invoked through the abts suite (./testall)
 # STDTEST_NONPORTABLE
 #   test programs invoked via standard user interface, not portable
 # OTHER_PROGRAMS
@@ -20,7 +22,17 @@
 	testshmproducer@EXEEXT@ \
 	testshmconsumer@EXEEXT@
 
-PROGRAMS = $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS)
+TESTALL_COMPONENTS = \
+	globalmutexchild@EXEEXT@ \
+	mod_test.slo \
+	occhild@EXEEXT@ \
+	proc_child@EXEEXT@ \
+	readchild@EXEEXT@ \
+	sockchild@EXEEXT@ \
+	tryread@EXEEXT@
+
+PROGRAMS = $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) \
+	   $(OTHER_PROGRAMS)
 
 TARGETS = $(PROGRAMS)
 
@@ -29,10 +41,11 @@
 
 LOCAL_LIBS=../lib@APR_LIBNAME@.la
 
-CLEAN_TARGETS = testfile.tmp mod_test.slo proc_child@EXEEXT@ occhild@EXEEXT@ \
-	readchild@EXEEXT@ tryread@EXEEXT@ sockchild@EXEEXT@ \
-	globalmutexchild@EXEEXT@ lfstests/large.bin \
+CLEAN_TARGETS = $(TESTALL_COMPONENTS) \
+	testfile.tmp \
+	lfstests/large.bin \
 	data/test*.txt data/test*.dat
+
 CLEAN_SUBDIRS = internal
 
 INCDIR=../include
@@ -40,9 +53,10 @@
 
 # link programs using -no-install to get real executables not
 # libtool wrapper scripts which link an executable when first run.
-LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
+LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) \
+	@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
 
-check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
 	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
 		./$$prog; \
 		if test $$? = 255; then \
@@ -51,53 +65,61 @@
 		fi; \
 	done
 
+abts.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
+	 $(srcdir)/testutil.h
+
+testutil.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
+	     $(srcdir)/testutil.h
+
 occhild@EXEEXT@: occhild.lo $(LOCAL_LIBS)
-	$(LINK_PROG) occhild.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 sockchild@EXEEXT@: sockchild.lo $(LOCAL_LIBS)
-	$(LINK_PROG) sockchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 readchild@EXEEXT@: readchild.lo $(LOCAL_LIBS)
-	$(LINK_PROG) readchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 globalmutexchild@EXEEXT@: globalmutexchild.lo $(LOCAL_LIBS)
-	$(LINK_PROG) globalmutexchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 tryread@EXEEXT@: tryread.lo $(LOCAL_LIBS)
-	$(LINK_PROG) tryread.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 proc_child@EXEEXT@: proc_child.lo $(LOCAL_LIBS)
-	$(LINK_PROG) proc_child.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
-# FIXME: -prefer-pic is only supported with libtool-1.4+
-mod_test.slo: $(srcdir)/mod_test.c
-	$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -c $(srcdir)/mod_test.c && touch $@
-
-mod_test.la: mod_test.slo $(LOCAL_LIBS)
-	$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-
-libmod_test.la: mod_test.slo $(LOCAL_LIBS)
-	$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(LOCAL_LIBS) $(ALL_LIBS)
+# Note: -prefer-pic is only supported with libtool-1.4+
+mod_test.lo: $(srcdir)/mod_test.c
+	$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -o $@ -c $<
+
+mod_test.la: mod_test.lo
+	$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -module \
+	  -avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $+
+
+libmod_test.la: mod_test.lo $(LOCAL_LIBS)
+	$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` \
+	  -avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $+ $(ALL_LIBS)
 
 testlockperf@EXEEXT@: testlockperf.lo $(LOCAL_LIBS)
-	$(LINK_PROG) testlockperf.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 sendfile@EXEEXT@: sendfile.lo $(LOCAL_LIBS)
-	$(LINK_PROG) sendfile.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 testshmproducer@EXEEXT@: testshmproducer.lo $(LOCAL_LIBS)
-	$(LINK_PROG) testshmproducer.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 testshmconsumer@EXEEXT@: testshmconsumer.lo $(LOCAL_LIBS)
-	$(LINK_PROG) testshmconsumer.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 testprocmutex@EXEEXT@: testprocmutex.lo $(LOCAL_LIBS)
-	$(LINK_PROG) testprocmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
 testmutexscope@EXEEXT@: testmutexscope.lo $(LOCAL_LIBS)
-	$(LINK_PROG) testmutexscope.lo $(LOCAL_LIBS) $(ALL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
 
-TESTS = testutil.lo testtime.lo teststr.lo testvsn.lo testipsub.lo \
+TESTS = testtime.lo teststr.lo testvsn.lo testipsub.lo \
 	testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
 	testfmt.lo testfile.lo testdir.lo testfileinfo.lo testrand.lo \
 	testdso.lo testoc.lo testdup.lo testsockets.lo testproc.lo \
@@ -107,11 +129,10 @@
         testatomic.lo testflock.lo testshm.lo testsock.lo testglobalmutex.lo \
         teststrnatcmp.lo testfilecopy.lo testtemp.lo testlfs.lo
 
-testall@EXEEXT@: $(TESTS) mod_test.la libmod_test.la occhild@EXEEXT@ \
-	 readchild@EXEEXT@ abts.lo proc_child@EXEEXT@ \
-         tryread@EXEEXT@ sockchild@EXEEXT@ globalmutexchild@EXEEXT@ \
-         $(LOCAL_LIBS)
-	$(LINK_PROG) $(TESTS) abts.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
+testall@EXEEXT@: $(TESTS) abts.lo testutil.lo $(LOCAL_LIBS)
+	$(LINK_PROG) $+ $(ALL_LIBS)
+# For VPATH builds; where we have no ./data, copy us some data
+# if we wait until 'make check', then 'make; ./testall' fails;
+	if test ! -d "./data"; then cp -r $(srcdir)/data data; fi
 
 # DO NOT REMOVE