You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/10/30 05:19:07 UTC
svn commit: r589956 - /apr/apr-util/trunk/test/Makefile.in
Author: wrowe
Date: Mon Oct 29 21:19:06 2007
New Revision: 589956
URL: http://svn.apache.org/viewvc?rev=589956&view=rev
Log:
Suggested by Joe Orton - $+ isn't sufficiently portable.
Still, simpler than we started with.
Modified:
apr/apr-util/trunk/test/Makefile.in
Modified: apr/apr-util/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.in?rev=589956&r1=589955&r2=589956&view=diff
==============================================================================
--- apr/apr-util/trunk/test/Makefile.in (original)
+++ apr/apr-util/trunk/test/Makefile.in Mon Oct 29 21:19:06 2007
@@ -47,25 +47,30 @@
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; \