pier 01/09/17 15:59:52
Modified: webapp/apache-1.3 Makefile.in
Log:
Final fix for APXS weirdnesses that doesn't want to build under RH71.
Revision Changes Path
1.19 +20 -9 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 2001/09/17 20:59:24 1.18
+++ Makefile.in 2001/09/17 22:59:52 1.19
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.18 2001/09/17 20:59:24 pier Exp $
+# @version $Id: Makefile.in,v 1.19 2001/09/17 22:59:52 pier Exp $
include @TGTDIR@/Makedefs
@@ -74,15 +74,26 @@
$(RM) -f $(OBJS) $(MOD)
$(MOD): $(SRCS) $(TGTDIR)/lib/libapr.a $(TGTDIR)/lib/libwebapp.a
- { \
- 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}" \
+ { APXS_LDFLAGS_SHLIB="`$(APXS) -q LDFLAGS_SHLIB` \
+ $(APR_LDFLAGS) \
+ $(APR_LIBS)" ; \
+ APXS_LDFLAGS_SHLIB=`$(ECHO) $${APXS_LDFLAGS_SHLIB}` ; \
+ APXS_CFLAGS="`$(APXS) -q CFLAGS` \
+ $(CFLAGS) \
+ $(APR_CFLAGS) \
+ $(CPPFLAGS) \
+ $(APR_CPPFLAGS) \
+ -I$(APR_INCDIR) \
+ -I$(SRCDIR)/include \
+ $(APR_INCLUDES)" ; \
+ APXS_CFLAGS=`$(ECHO) $${APXS_CFLAGS}` ; \
+ $(APXS) \
-S CFLAGS="$${APXS_CFLAGS}" \
- -I$(APR_INCDIR) -I$(SRCDIR)/include $(APR_INCLUDES) $(APR_LIBS) \
- $(TGTDIR)/lib/libapr.a $(TGTDIR)/lib/libwebapp.a \
- -o "$@" $< ; \
+ -S LDFLAGS_SHLIB="$${APXS_LDFLAGS_SHLIB}" \
+ -o "$@" \
+ -c "mod_webapp.c" \
+ "$(TGTDIR)/lib/libwebapp.a" \
+ "$(TGTDIR)/lib/libapr.a" ; \
}
$(SRCS):
