pier 01/09/17 13:51:56
Modified: webapp/apache-1.3 Makefile.in
Log:
Another attempt to fix the APXS -Wc, -Wl, problem under Linux.
Revision Changes Path
1.17 +11 -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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in 2001/09/17 20:34:52 1.16
+++ Makefile.in 2001/09/17 20:51:56 1.17
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.16 2001/09/17 20:34:52 pier Exp $
+# @version $Id: Makefile.in,v 1.17 2001/09/17 20:51:56 pier Exp $
include @TGTDIR@/Makedefs
@@ -74,12 +74,16 @@
$(RM) -f $(OBJS) $(MOD)
$(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) \
- $(TGTDIR)/lib/libapr.a $(TGTDIR)/lib/libwebapp.a \
- -o "$@" $<
+ { \
+ APXS_LDFLAGS_SHLIB="`$(APXS) -q LDFLAGS_SHLIB` $(APR_LDFLAGS)" ; \
+ APXS_CFLAGS="`$(APXS) -q CFLAGS` $(CFLAGS) $(APR_CFLAGS) $(CPPFLAGS)
$(APR_CPPFLAGS)" ; \
+ $(APXS) -c \
+ -S LDFLAGS_SHLIB="$${APXS_LDFLAGS_SHLIB}" \
+ -S CFLAGS="$${APXS_CFLAGS}" \
+ -I$(APR_INCDIR) -I$(SRCDIR)/include $(APR_INCLUDES) \
+ $(TGTDIR)/lib/libapr.a $(TGTDIR)/lib/libwebapp.a \
+ -o "$@" $< ; \
+ }
$(SRCS):
$(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@
