pier 01/09/17 13:34:52
Modified: webapp/apache-1.3 Makefile.in
Log:
Fix long lasting Linux "ld" and "/bin/sh" problems (parsing of commas in
"sh" and linking two static libraries with "ld")
Revision Changes Path
1.16 +7 -7 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 2001/09/17 05:08:08 1.15
+++ Makefile.in 2001/09/17 20:34:52 1.16
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.15 2001/09/17 05:08:08 pier Exp $
+# @version $Id: Makefile.in,v 1.16 2001/09/17 20:34:52 pier Exp $
include @TGTDIR@/Makedefs
@@ -73,13 +73,13 @@
clean:
$(RM) -f $(OBJS) $(MOD)
-$(MOD): $(SRCS) $(TGTDIR)/lib/libwebapp.a
- @$(APXS) -c \
- -Wc,"$(CFLAGS) $(APR_CFLAGS) $(CPPFLAGS) $(APR_CPPFLAGS)" \
- -Wl,"$(APR_LDFLAGS)" $(APR_LIBS) \
+$(MOD): $(SRCS) $(TGTDIR)/lib/libapr.a $(TGTDIR)/lib/libwebapp.a
+ $(APXS) -c \
+ "-Wc,$(CFLAGS) $(APR_CFLAGS) $(CPPFLAGS) $(APR_CPPFLAGS)" \
+ "-Wl,$(APR_LDFLAGS)" $(APR_LIBS) \
-I$(APR_INCDIR) -I$(SRCDIR)/include $(APR_INCLUDES) \
- -L$(TGTDIR)/lib -L$(APR_LIBDIR) \
- -lapr -lwebapp -o "$@" $<
+ $(TGTDIR)/lib/libapr.a $(TGTDIR)/lib/libwebapp.a \
+ -o "$@" $<
$(SRCS):
$(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@
