jorton 2004/06/07 23:25:14
Modified: test Makefile.in
Log:
* test/Makefile.in: Revert broken r1.161.
Revision Changes Path
1.162 +0 -4 apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.161
retrieving revision 1.162
diff -d -w -u -r1.161 -r1.162
--- Makefile.in 7 Jun 2004 21:21:35 -0000 1.161
+++ Makefile.in 8 Jun 2004 06:25:13 -0000 1.162
@@ -71,11 +71,7 @@
$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -c
$(srcdir)/mod_test.c && touch $@
mod_test.la: mod_test.slo $(LOCAL_LIBS)
-<<<<<<< Makefile.in
- $(LIBTOOL) --mode=link $(COMPILE) -rpath $(srcdir) -avoid-version
-module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-=======
$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd`
-avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
->>>>>>> 1.159
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 $@
