You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by br...@hyperreal.org on 1998/06/16 05:49:58 UTC
cvs commit: apache-1.3/src Configuration.tmpl Makefile.tmpl
brian 98/06/15 20:49:57
Modified: . configure STATUS
src Configuration.tmpl Makefile.tmpl
Log:
Submitted by: Ralf Engelschall
Reviewed by: Marc, Jim
* Ralf's "EXTRA_DEPS to add extra dependecies to httpd target"
This patch adds an EXTRA_DEPS configuration parameter which can be used
to add an extra Makefile dependency for the httpd target, for instance
to external third-party libraries, etc.
Revision Changes Path
1.34 +3 -3 apache-1.3/configure
Index: configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure 1998/06/16 03:28:45 1.33
+++ configure 1998/06/16 03:49:52 1.34
@@ -229,7 +229,7 @@
# parameter names to the canonical Autoconf-style shell
# variable names.
OIFS="$IFS" IFS="$DIFS"
-for var in CFLAGS LDFLAGS LIBS INCLUDES; do
+for var in CFLAGS LDFLAGS LIBS INCLUDES DEPS; do
eval "val=\$EXTRA_$var"
if [ ".$val" != . ]; then
eval "$var=\$val"
@@ -897,11 +897,11 @@
# generate settings from imported environment variables
OIFS="$IFS" IFS="$DIFS"
for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
- LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do
+ LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS; do
eval "val=\"\$$var\"";
if [ ".$val" != . ]; then
case $var in
- CFLAGS|LDFLAGS|LIBS|INCLUDES)
+ CFLAGS|LDFLAGS|LIBS|INCLUDES|DEPS)
echo "s%^#*\\(EXTRA_$var=\\).*%\\1$val%g" >>$sedsubst
;;
*)
1.429 +0 -7 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- STATUS 1998/06/16 03:37:07 1.428
+++ STATUS 1998/06/16 03:49:52 1.429
@@ -59,13 +59,6 @@
See: http://www.engelschall.com/sw/apache/ [libshlib]
Status (for 1.3.1-dev): Ralf +1
- * Ralf's "EXTRA_DEPS to add extra dependecies to httpd target"
- This patch adds an EXTRA_DEPS configuration parameter which can be used
- to add an extra Makefile dependency for the httpd target, for instance
- to external third-party libraries, etc.
- See: http://www.engelschall.com/sw/apache/ [extradeps]
- Status (for 1.3.1-dev): Ralf +1, Marc +1, Jim +1
-
* Paul's patch to add integrated restart/shutdown signalling (Win32)
This patch make Apache listen on predictable event names to allow
restarts and shutdowns to be initiated. Also adds a new command line
1.105 +5 -0 apache-1.3/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- Configuration.tmpl 1998/05/12 12:13:50 1.104
+++ Configuration.tmpl 1998/06/16 03:49:56 1.105
@@ -47,10 +47,15 @@
# these for compiling Apache is risky. If you don't want to see Apache dumping
# core regularly then at most use -O or -O2.
#
+# The EXTRA_DEPS can be used to add extra Makefile dependencies to external
+# files (for instance third-party libraries) for the httpd target. The effect
+# is that httpd is relinked when those files are changed.
+#
EXTRA_CFLAGS=
EXTRA_LDFLAGS=
EXTRA_LIBS=
EXTRA_INCLUDES=
+EXTRA_DEPS=
#CC=
#OPTIM=
1.97 +1 -1 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- Makefile.tmpl 1998/05/22 06:56:56 1.96
+++ Makefile.tmpl 1998/06/16 03:49:57 1.97
@@ -23,7 +23,7 @@
@echo "++ If not, you will at least have to touch '@@Configuration@@'."
@false
-$(TARGET): $(SUBTARGET)
+$(TARGET): $(EXTRA_DEPS) $(SUBTARGET)
target_static: subdirs modules.o
$(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c