Suggested by Joe Orton - $+ isn't sufficiently portable.

Still, simpler than we started with.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@589956 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 10 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index 15a6302a..28c42329 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -47,25 +47,30 @@ abts.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
 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_LIBS)
+OBJECTS_testall = abts.lo testutil.lo $(TESTS) $(LOCAL_LIBS)
+testall: $(OBJECTS_testall)
+	$(LINK_PROG) $(OBJECTS_testall) $(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_LIBS)
+OBJECTS_dbd = dbd.lo $(LOCAL_LIBS)
+dbd: $(OBJECTS_dbd)
+	$(LINK_PROG) $(OBJECTS_dbd) $(APRUTIL_LIBS)
 
-testssl: testssl.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $+ $(APRUTIL_LIBS)
+OBJECTS_testssl = testssl.lo $(LOCAL_LIBS)
+testssl: $(OBJECTS_testssl)
+	$(LINK_PROG) $(OBJECTS_testssl) $(APRUTIL_LIBS)
 
 # OTHER_PROGRAMS;
 
-echod: echod.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $+ $(APRUTIL_LIBS)
+OBJECTS_echod = echod.lo $(LOCAL_LIBS)
+echod: $(OBJECTS_echod)
+	$(LINK_PROG) $(OBJECTS_echod) $(APRUTIL_LIBS)
 
-sockperf: sockperf.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $+ $(APRUTIL_LIBS)
+OBJECTS_sockperf = sockperf.lo $(LOCAL_LIBS)
+sockperf: $(OBJECTS_sockperf)
+	$(LINK_PROG) $(OBJECTS_sockperf) $(APRUTIL_LIBS)
 
 check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
 	teststatus=0; \