jorton 2003/11/17 04:58:24
Modified: test Makefile.in
Log:
* Makefile.in: Link programs using -no-install flag so that they
really are binary executables, not libtool wrapper scripts, and
without the -avoid-version flag which produces a warning for
programs.
(reinforced dependency on libtool >=1.4 for this Makefile)
Revision Changes Path
1.145 +21 -17 apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -u -r1.144 -r1.145
--- Makefile.in 5 Nov 2003 13:34:53 -0000 1.144
+++ Makefile.in 17 Nov 2003 12:58:24 -0000 1.145
@@ -42,6 +42,10 @@
INCDIR=../include
INCLUDES=-I$(INCDIR)
+# 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)
-no-install $(ALL_LDFLAGS) -o $@
+
check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
./$$prog; \
@@ -52,16 +56,16 @@
done
[EMAIL PROTECTED]@: testflock.lo $(LOCAL_LIBS)
- $(LINK) testflock.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testflock.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: occhild.lo $(LOCAL_LIBS)
- $(LINK) occhild.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) occhild.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: readchild.lo $(LOCAL_LIBS)
- $(LINK) readchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) readchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: proc_child.lo $(LOCAL_LIBS)
- $(LINK) proc_child.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) proc_child.lo $(LOCAL_LIBS) $(ALL_LIBS)
# FIXME: -prefer-pic is only supported with libtool-1.4+
mod_test.slo: $(srcdir)/mod_test.c
@@ -74,40 +78,40 @@
$(LIBTOOL) --mode=link $(COMPILE) -rpath `pwd` -avoid-version
mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
[EMAIL PROTECTED]@: testlockperf.lo $(LOCAL_LIBS)
- $(LINK) testlockperf.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testlockperf.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: testsock.lo [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL
PROTECTED]@ $(LOCAL_LIBS)
- $(LINK) testsock.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testsock.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: client.lo $(LOCAL_LIBS)
- $(LINK) client.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) client.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: server.lo $(LOCAL_LIBS)
- $(LINK) server.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) server.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: sendfile.lo $(LOCAL_LIBS)
- $(LINK) sendfile.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) sendfile.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: testshm.lo $(LOCAL_LIBS) [EMAIL PROTECTED]@ [EMAIL
PROTECTED]@
- $(LINK) testshm.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testshm.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: testshmproducer.lo $(LOCAL_LIBS)
- $(LINK) testshmproducer.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testshmproducer.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: testshmconsumer.lo $(LOCAL_LIBS)
- $(LINK) testshmconsumer.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testshmconsumer.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: testprocmutex.lo $(LOCAL_LIBS)
- $(LINK) testprocmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testprocmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: testglobalmutex.lo $(LOCAL_LIBS)
- $(LINK) testglobalmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testglobalmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: testatomic.lo $(LOCAL_LIBS)
- $(LINK) testatomic.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testatomic.lo $(LOCAL_LIBS) $(ALL_LIBS)
[EMAIL PROTECTED]@: testmutexscope.lo $(LOCAL_LIBS)
- $(LINK) testmutexscope.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) testmutexscope.lo $(LOCAL_LIBS) $(ALL_LIBS)
TESTS = testall.lo testtime.lo teststr.lo testvsn.lo testipsub.lo \
testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
@@ -119,7 +123,7 @@
testall: $(TESTS) mod_test.la libmod_test.la [EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ CuTest.lo [EMAIL PROTECTED]@ $(LOCAL_LIBS)
- $(LINK) $(TESTS) CuTest.lo $(LOCAL_LIBS) $(ALL_LIBS)
+ $(LINK_PROG) $(TESTS) CuTest.lo $(LOCAL_LIBS) $(ALL_LIBS)
# DO NOT REMOVE
