You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@apache.org on 2002/05/13 10:13:06 UTC
cvs commit: apache-1.3/src Configure Makefile.tmpl
martin 02/05/13 01:13:06
Modified: src Configure Makefile.tmpl
Log:
Fix propagation of ${OPTIM} to subdirectories (which used to work in
early 1.3's at least), so that it is possible to do a
make OPTIM=-g
from the src/ directory to temporarily override the default
(e.g., for debugging).
Revision Changes Path
1.453 +2 -2 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- Configure 21 Mar 2002 17:13:04 -0000 1.452
+++ Configure 13 May 2002 08:13:06 -0000 1.453
@@ -2475,8 +2475,8 @@
if [ "x\$\$i" != "x" ]; then \\
echo "===> \$(SDP)modules/\$\$i"; \\
case "x\$(OS)" in \\
- xOS390 | xTPF) (cd \$\$i && \$(MAKE) SDP='\$(SDP)' \$@) || exit 1;; \\
- *) (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1;; \\
+ xOS390 | xTPF) (cd \$\$i && \$(MAKE) SDP='\$(SDP)' OPTIM='\$(OPTIM)' \$@) || exit 1;; \\
+ *) (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' OPTIM='\$(OPTIM)' \$@) || exit 1;; \\
esac; \\
echo "<=== \$(SDP)modules/\$\$i"; \\
fi; \\
1.119 +5 -5 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- Makefile.tmpl 27 Sep 2001 18:12:04 -0000 1.118
+++ Makefile.tmpl 13 May 2002 08:13:06 -0000 1.119
@@ -64,8 +64,8 @@
@for i in $(SUBDIRS); do \
echo "===> $(SDP)$$i"; \
case ".$(OS)" in \
- .OS390 | .TPF) ( cd $$i && $(MAKE) SDP='$(SDP)' ) || exit 1;; \
- *) ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1;; \
+ .OS390 | .TPF) ( cd $$i && $(MAKE) SDP='$(SDP)' OPTIM='$(OPTIM)') || exit 1;; \
+ *) ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' OPTIM='$(OPTIM)') || exit 1;; \
esac; \
echo "<=== $(SDP)$$i"; \
done
@@ -74,14 +74,14 @@
support-dir:
@echo "===> $(SDP)support"; \
- cd support; $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' || exit 1; \
+ cd support; $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' OPTIM='$(OPTIM)' || exit 1; \
echo "<=== $(SDP)support"
clean:
-rm -f $(TARGET) lib$(TARGET).* *.o
@for i in $(SUBDIRS); do \
echo "===> $(SDP)$$i"; \
- ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit 1; \
+ ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' OPTIM='$(OPTIM)' $@ ) || exit 1; \
echo "<=== $(SDP)$$i"; \
done
@@ -116,7 +116,7 @@
> Makefile.tmpl \
&& rm Makefile.new
for i in $(SUBDIRS); do \
- ( cd $$i && $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend ) || exit 1; \
+ ( cd $$i && $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' OPTIM='$(OPTIM)' depend ) || exit 1; \
done
#Dependencies