From 0ff7d215833ea4a8acd8949047e74d5d4a1761c3 Mon Sep 17 00:00:00 2001
From: wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 28 Oct 2007 21:52:12 +0000
Subject: Restructure LINK_PROG similar to apr/test/Makefile.in, simplifying
 the dependent targets.  Although ALL_LIBS and ALL_LDFLAGS would appear to be
 better choices, this is stacked differently than apr's in the first place.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@589424 13f79535-47bb-0310-9956-ffa450edef68
---
 test/Makefile.in | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/Makefile.in b/test/Makefile.in
index 76f08f54..9bc5c651 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,8 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-# PROGRAMS
+# PROGRAMS includes all test programs built on this platform.
+# STDTEST_PORTABLE
 #   test programs invoked via standard user interface, run on all platforms
 # ALL_TESTS
 #   test modules invoked through the abts suite (./testall)
@@ -30,13 +31,13 @@ CLEAN_TARGETS = manyfile.bin testfile.txt data/sqlite*.db
 
 # bring in rules.mk for standard functionality
 @INCLUDE_RULES@
-PROGRAM_DEPENDENCIES = @APRUTIL_LIBS@
-APRUTIL_LDFLAGS = -no-install @APRUTIL_LDFLAGS@
+APRUTIL_LIBS = @APRUTIL_LIBS@
+APRUTIL_LDFLAGS = $(ALL_LDFLAGS) @LT_NO_INSTALL@ @APRUTIL_LDFLAGS@
 
 # 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 $@
+	    $(APRUTIL_LDFLAGS) -o $@
 
 # STDTEST_PORTABLE;
 
@@ -47,24 +48,24 @@ testutil.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
 	     $(srcdir)/testutil.h
 
 testall: $(TESTS) abts.lo testutil.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $(APRUTIL_LDFLAGS) $+ $(PROGRAM_DEPENDENCIES)
+	$(LINK_PROG) $+ $(APRUTIL_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
 
 dbd: dbd.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $(APRUTIL_LDFLAGS) $+ $(PROGRAM_DEPENDENCIES)
+	$(LINK_PROG) $+ $(APRUTIL_LIBS)
 
 testssl: testssl.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $(APRUTIL_LDFLAGS) $+ $(PROGRAM_DEPENDENCIES)
+	$(LINK_PROG) $+ $(APRUTIL_LIBS)
 
 # OTHER_PROGRAMS;
 
 echod: echod.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $(APRUTIL_LDFLAGS) $+ $(PROGRAM_DEPENDENCIES)
+	$(LINK_PROG) $+ $(APRUTIL_LIBS)
 
 sockperf: sockperf.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $(APRUTIL_LDFLAGS) $+ $(PROGRAM_DEPENDENCIES)
+	$(LINK_PROG) $+ $(APRUTIL_LIBS)
 
 check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
 	teststatus=0; \
-- 
cgit v1.2.1