diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-06-08 06:25:13 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-06-08 06:25:13 +0000 |
| commit | e4089b090f379d6f5b0b3e7aa57ef0493e7e862f (patch) | |
| tree | 6bcd0de18bb8b80cad31f196b36098c1643951d4 | |
| parent | dd17917e5a3d95fdfc708cc52491ef8a674ff198 (diff) | |
| download | libapr-e4089b090f379d6f5b0b3e7aa57ef0493e7e862f.tar.gz | |
* test/Makefile.in: Revert broken r1.161.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65174 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | test/Makefile.in | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index e77ce9a61..84548b83d 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -71,11 +71,7 @@ mod_test.slo: $(srcdir)/mod_test.c $(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 $@ |