rse 98/03/17 07:42:43
Modified: src CHANGES Configure Makefile.tmpl
src/ap Makefile.tmpl
src/main Makefile.tmpl
src/modules/example Makefile.tmpl
src/modules/experimental Makefile.tmpl
src/modules/extra Makefile.tmpl
src/modules/proxy Makefile.tmpl
src/modules/standard Makefile.tmpl
src/modules/test Makefile.tmpl
src/os/bs2000 Makefile.tmpl
src/os/emx Makefile.tmpl
src/os/unix Makefile.tmpl
src/regex Makefile.tmpl
src/support Makefile.tmpl
Log:
Major Configure Cleanup
=======================
1. Now every Makefile receives a SRCDIR option which
is set to ".", "..". "../.." etc. for the various subdirs and thus shows
the individual path to the root of our src/ directory.
[MAJOR CHANGE]
2. Replaced ugly INCLUDES_DEPTH[0-2] kludge with a SRCDIR based
INCLUDES0 option which now reads ``INCLUDES0=-I$(SRCDIR)/os/unix
-I$(SRCDIR)/include''
[MAJOR CHANGE]
3. Now replaced all locally defined INCDIR's with a globally
defined INCDIR=$(SRCDIR)/include
4. Removed the TARGET option from all Makefiles (because it is
not needed there) except for the top-level one (where it is needed)
5. Stripped confusing comments (##RULE..., etc.) and
consequently add Begin/End comments for the generated sections
6. All Makefiles now contain a header with inheritance
information, i.e. from which files it was derived
7. Subdirectory movement messages is now built-in for easier
following where the build process currently stays.
8. All comments now have the same style in the Configure script.
9. The Apache license header was added to the Configure script
10. Fixed a few bugs in Configure ([<space><tab>] vs. [<space><space>], etc.)
11. Tested under FreeBSD, Linux, Solaris and SunOS to make sure no
new bugs were introduced. Hmmm....
[Re-run the Configure script!]
Revision Changes Path
1.721 +9 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.720
retrieving revision 1.721
diff -u -r1.720 -r1.721
--- CHANGES 1998/03/17 13:08:50 1.720
+++ CHANGES 1998/03/17 15:42:22 1.721
@@ -1,5 +1,14 @@
Changes with Apache 1.3b6
+ *) Major cleanups to the Configure script to make it and its generated
+ Makefiles again readable and maintainable: add SRCDIR option, removed
+ INCLUDES_DEPTH[0-2] kludge, cleanup of TARGET option, cleanup of
+ generated sections, consequently added Makefile headers with inheritance
+ information, added subdir movement messages for easier following where
+ the build process currently stays (more verbose then standard Make, less
+ verbose than GNU make), same style to comments in the Configure script,
+ added Apache license header, fixed a few bugs, etc. [Ralf S.
Engelschall]
+
*) The default for the HIDE rule is now "yes" to aid portability, and
include/hide.h is always included. It doesn't do anything if the
rule is "no" but the dependencies don't change now regardless.
1.211 +335 -254 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- Configure 1998/03/16 18:36:17 1.210
+++ Configure 1998/03/17 15:42:23 1.211
@@ -1,23 +1,80 @@
#!/bin/sh
-exitcode=0
-trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $tmpconfig $awkfile; exit
$exitcode' 0 1 2 3 15
+## ====================================================================
+## Copyright (c) 1995-1998 The Apache Group. All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##
+## 1. Redistributions of source code must retain the above copyright
+## notice, this list of conditions and the following disclaimer.
+##
+## 2. Redistributions in binary form must reproduce the above copyright
+## notice, this list of conditions and the following disclaimer in
+## the documentation and/or other materials provided with the
+## distribution.
+##
+## 3. All advertising materials mentioning features or use of this
+## software must display the following acknowledgment:
+## "This product includes software developed by the Apache Group
+## for use in the Apache HTTP server project (http://www.apache.org/)."
+##
+## 4. The names "Apache Server" and "Apache Group" must not be used to
+## endorse or promote products derived from this software without
+## prior written permission. For written permission, please contact
+## [EMAIL PROTECTED]
+##
+## 5. Redistributions of any form whatsoever must retain the following
+## acknowledgment:
+## "This product includes software developed by the Apache Group
+## for use in the Apache HTTP server project (http://www.apache.org/)."
+##
+## THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+## EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
+## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+## NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+## LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+## STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+## ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+## OF THE POSSIBILITY OF SUCH DAMAGE.
+## ====================================================================
+##
+## This software consists of voluntary contributions made by many
+## individuals on behalf of the Apache Group and was originally based
+## on public domain software written at the National Center for
+## Supercomputing Applications, University of Illinois, Urbana-Champaign.
+## For more information on the Apache Group and the Apache HTTP server
+## project, please see <http://www.apache.org/>.
+# HISTORY:
+#
# Apache configuration script, first cut --- rst.
# Don't like it? Inspired to do something better? Go for it.
-
+#
# second cut --- jmj
# At this point we change what Configuration contains. It maintain
# contains comments, specific compiler flags, a list of included
# modules and "rules". These rules are used to allow Configure to
# be totally configured from Configuration.
#
+# third cut --- rse
+# Big cleanup of the generated Makefiles and remove of
+# some old kludges
+
# Uses 4 supplemental scripts located in ./helpers:
# CutRule: Determines the value for a specified Rule
# GuessOS: Uses uname to determine OS/platform
# PrintPath: generic "type" or "whence" replacement
# TestCompile: Can check for libs and if $(CC) is ANSI
# (i.e., a simple "sanity check")
-#
+
+exitcode=0
+trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $tmpconfig $awkfile; exit
$exitcode' 0 1 2 3 15
+
####################################################################
## Set up some defaults
##
@@ -30,6 +87,30 @@
SUBDIRS='$(OSDIR) main ap modules'
####################################################################
+## Some helper functions
+##
+fp2rp () {
+ if [ "x$1" = x. ]; then
+ rp="."
+ else
+ rp=""
+ for pe in `echo $1 | sed -e 's:/: :'`; do
+ rp="../$rp"
+ done
+ fi
+ echo $rp | sed -e 's:/$::'
+}
+mfhead () {
+ echo "##"
+ echo "## Apache Makefile, automatically generated by Configure script."
+ echo "## Hand-edited changes will be lost if the Configure script is
re-run."
+ echo "## Sources: - `fp2rp $1`/Makefile.config (via $file)"
+ echo "## - ./Makefile.tmpl"
+ echo "##"
+ echo ""
+}
+
+####################################################################
## Now handle any arguments, which, for now, is -file
## to select an alternate Configuration file
##
@@ -46,7 +127,6 @@
shift 1
fi
done
-
if [ ! -r $file ]; then
echo "Can't see or read \"$file\""
echo "Please copy Configuration.tmpl to $file, edit it for your platform,"
@@ -55,13 +135,12 @@
exit 1
fi
-#
-# Now see if Configuration.tmpl is more recent than $file. If
-# so, then we complain and bail out
-#
-
+####################################################################
+## Now see if Configuration.tmpl is more recent than $file. If
+## so, then we complain and bail out
+##
if ls -lt Configuration.tmpl $file | head -1 | \
- grep 'Configuration.tmpl' > /dev/null
+ grep 'Configuration.tmpl' > /dev/null
then
echo "Configuration.tmpl is more recent than $file;"
echo "Make sure that $file is valid and, if it is, simply"
@@ -76,29 +155,27 @@
## From the Configuration file, create a "cleaned-up" version
## that's easy to scan
##
-#
+
# Strip comments and blank lines, remove whitespace around
# "=" assignments, change Rules to comments and then remove whitespace
# before Module declarations
-#
sed 's/#.*//' $file | \
sed '/^[ ]*$/d' | \
sed 's/[ ]*$//' | \
sed 's/[ ]*=[ ]*/=/' | \
- sed 's/^Rule[ ]*/##Rule:/' | \
+ sed '/^Rule[ ]*/d' | \
sed 's/^[ ]*AddModule/AddModule/' | \
- sed 's/^[ ]*%AddModule/%AddModule/' | \
- sed 's/^[ ]*SharedModule/SharedModule/' | \
+ sed 's/^[ ]*%AddModule/%AddModule/' | \
+ sed 's/^[ ]*SharedModule/SharedModule/' | \
sed 's/^[ ]*Module/Module/' | \
- sed 's/^[ ]*%Module/%Module/' > $tmpfile
+ sed 's/^[ ]*%Module/%Module/' > $tmpfile
+# Determine if shared objects are used
using_shlib=`grep '^SharedModule' $tmpfile >/dev/null && echo 1`
-#
# Only "assignment" ("=") statements and Module lines
# should be left at this point. If there is other stuff
# we bail out
-#
if egrep -v '^%?Module[ ]+[A-Za-z0-9_]+[ ]+[^ ]+$' $tmpfile \
| egrep -v '^%?AddModule[ ]+[^ ]+$' \
| egrep -v '^SharedModule[ ]+[^ ]+$' \
@@ -115,19 +192,12 @@
exit 1
fi
-#
-# File is OK --- make backup copies of things and then get the new ones:
-#
-if [ -f Makefile ] ; then mv Makefile Makefile.bak; fi
-if [ -f modules.c ] ; then mv modules.c modules.c.bak; fi
-
####################################################################
-# If we find the directory /usr/local/etc/httpd and there is
-# no HTTPD_ROOT flag set in the Configuration file we assume
-# that the user was using the old default root directory
-# and issue a notice about it.
-#
-
+## If we find the directory /usr/local/etc/httpd and there is
+## no HTTPD_ROOT flag set in the Configuration file we assume
+## that the user was using the old default root directory
+## and issue a notice about it.
+##
if [ -d /usr/local/etc/httpd/ ]
then
if egrep '^EXTRA_CFLAGS.*HTTPD_ROOT' $file >/dev/null
@@ -144,34 +214,30 @@
fi
####################################################################
-# Start creating the Makefile. We add some comments and
-# then fold in the modules that were included in Configuration
-#
+## Start creating the Makefile. We add some comments and
+## then fold in the modules that were included in Configuration
+##
echo "Creating Makefile"
-echo "#" > Makefile
-echo "# Makefile automatically generated from Makefile.tmpl" >> Makefile
-echo "# and configuration file by Apache config script." >> Makefile
-echo "# Hand-edited changes will be lost if the config script" >> Makefile
-echo "# is re-run" >> Makefile
-echo "#" >> Makefile
+mfhead . > Makefile
####################################################################
-# Now we create a stub file, called Makefile.config, which
-# just includes those assignments (eg: CC=gcc) in Configuration
-#
+## Now we create a stub file, called Makefile.config, which
+## just includes those assignments (eg: CC=gcc) in Configuration
+##
awk >Makefile.config <$tmpfile '
BEGIN {
- print "# Makefile options inherited from Configure"
- print "###############"
+ print "##"
+ print "## Inherited Makefile options from Configure script"
+ print "## (Begin of automatically generated section)"
+ print "##"
+ print "SRCDIR=."
}
/\=/ { print }
- END {
- print "###############"
- }'
+ '
####################################################################
-# Extract the rules.
-#
+## Extract the rules.
+##
RULE_WANTHSREGEX=`./helpers/CutRule WANTHSREGEX $file`
RULE_STATUS=`./helpers/CutRule STATUS $file`
RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file`
@@ -181,15 +247,15 @@
RULE_HIDE=`./helpers/CutRule HIDE $file`
####################################################################
-# Preset some "constants"; can be overridden on a per-platform basis below.
-#
+## Preset some "constants";
+## can be overridden on a per-platform basis below.
+##
DBM_LIB="-ldbm"
DB_LIB="-ldb"
SHELL="/bin/sh"
TARGET="httpd"
PRINTPATH=PrintPath
CAT="cat"
-
if ./helpers/$PRINTPATH -s ranlib; then
RANLIB="ranlib"
else
@@ -197,22 +263,20 @@
fi
####################################################################
-# Now we determine the OS/Platform automagically, thanks to
-# GuessOS, a home-brewed OS-determiner ala config.guess
-#
-# We adjust CFLAGS, LIBS, LDFLAGS and INCLUDES (and other Makefile
-# options) as required. Setting CC and OPTIM here has no effect
-# if they were set in Configure.
-#
-# Also, we set DEF_WANTHSREGEX and to the appropriate
-# value for each platform.
-#
-# As more PLATFORMs are added to Configuration.tmpl, be sure to
-# add the required lines below.
-#
-
+## Now we determine the OS/Platform automagically, thanks to
+## GuessOS, a home-brewed OS-determiner ala config.guess
+##
+## We adjust CFLAGS, LIBS, LDFLAGS and INCLUDES (and other Makefile
+## options) as required. Setting CC and OPTIM here has no effect
+## if they were set in Configure.
+##
+## Also, we set DEF_WANTHSREGEX and to the appropriate
+## value for each platform.
+##
+## As more PLATFORMs are added to Configuration.tmpl, be sure to
+## add the required lines below.
+##
PLAT=`./helpers/GuessOS`
-
SHELL="/bin/sh"
OSDIR="os/unix"
@@ -287,7 +351,7 @@
LIBS="$LIBS -lm"
;;
*-sgi-irix64)
-# Note: We'd like to see patches to compile 64-bit, but for now...
+ # Note: We'd like to see patches to compile 64-bit, but for now...
echo "You are running 64-bit Irix. For now, we will compile 32-bit"
echo "but if you would care to port to 64-bit, send us the patches."
CFLAGS="$CFLAGS -n32"
@@ -595,9 +659,14 @@
;;
esac
-#
-# And adjust/override WANTHSREGEX as needed
-#
+####################################################################
+## Show user what OS we came up with
+##
+echo " + configured for $OS platform"
+
+####################################################################
+## And adjust/override WANTHSREGEX as needed
+##
if [ "$RULE_WANTHSREGEX" = "default" ]; then
if [ "x$DEF_WANTHSREGEX" = "x" ]; then
RULE_WANTHSREGEX=yes
@@ -607,37 +676,20 @@
fi
####################################################################
-# Show user what OS we came up with
-#
-echo " + configured for $OS platform"
-
-####################################################################
-# And update Makefile.config with what we came up with
-#
-echo "###############" >> Makefile.config
-echo "# Platform: $OS" >> Makefile.config
-echo "# Final Rules:" >> Makefile.config
-echo "# Rule WANTHSREGEX=$RULE_WANTHSREGEX" >> Makefile.config
-echo "###############" >> Makefile.config
+## Now we determine the C-compiler and optimization level
+## to use. Settings of CC and OPTIM in Configuration have
+## the highest precedence; next comes any settings from
+## the above "OS-specific" section. If still unset,
+## then we look for a known compiler somewhere in PATH
+##
-####################################################################
-# Now we determine the C-compiler and optimization level
-# to use. Settings of CC and OPTIM in Configuration have
-# the highest precedence; next comes any settings from
-# the above "OS-specific" section. If still unset,
-# then we look for a known compiler somewhere in PATH
-#
-#
# First, look for a CC=<whatever> setting in Configure (recall, we
# copied these to Makefile.config)
-#
TCC=`egrep '^CC=' Makefile.config | tail -1 | awk -F= '{print $2}'`
if [ "x$TCC" = "x" ]; then
if [ "x$CC" = "x" ]; then
- #
- # At this point, CC is not set in Configure or above, so we
- # try to find one
- #
+ # At this point, CC is not set in Configure or above, so we
+ # try to find one
for compilers in "gcc" "cc" "acc" "c89"
do
lookedfor="$lookedfor $compilers"
@@ -659,27 +711,27 @@
fi
####################################################################
-# Look for OPTIM and save for later
-#
+## Look for OPTIM and save for later
+##
TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'`
####################################################################
-# Set the value of CC if need be
-#
+## Set the value of CC if need be
+##
if [ "x$TCC" = "x" ]; then
echo "CC=$CC" >> Makefile.config
fi
####################################################################
-# Check for user provided flags for shared object support
-#
+## Check for user provided flags for shared object support
+##
TLDFLAGS_SHLIB=`egrep '^LDFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F=
'{print $2}'`
TCFLAGS_SHLIB=`egrep '^CFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F=
'{print $2}'`
####################################################################
-# We adjust now CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT as
-# required. For more platforms just add the required lines below.
-#
+## We adjust now CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT as
+## required. For more platforms just add the required lines below.
+##
if [ "x$using_shlib" = "x1" ] ; then
case "$PLAT" in
*-linux1)
@@ -753,9 +805,9 @@
fi
####################################################################
-# Check if we really have some information to compile
-# the shared objects if SharedModule was used.
-#
+## Check if we really have some information to compile
+## the shared objects if SharedModule was used.
+##
if [ "x$using_shlib" = "x1" ] ; then
if [ "x$TCFLAGS_SHLIB" = x -a "x$CFLAGS_SHLIB" = x -a \
"x$TLDFLAGS_SHLIB" = x -a "x$LDFLAGS_SHLIB" = x ]; then
@@ -770,9 +822,9 @@
fi
####################################################################
-# Set the value of the shared libary flags, if they aren't explicitly
-# set in the configuration file
-#
+## Set the value of the shared libary flags, if they aren't explicitly
+## set in the configuration file
+##
if [ "x$using_shlib" = "x1" ] ; then
if [ "x$TCFLAGS_SHLIB" = "x" ]; then
echo "CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE" >> Makefile.config
@@ -783,14 +835,14 @@
if [ "x$TLDFLAGS_SHLIB_EXPORT" = "x" ]; then
echo "LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT" >> Makefile.config
fi
-fi # end of $using_shlib section
+fi
####################################################################
-# Now we do some OS specific adjustments... for some OSs, we need
-# to adjust CFLAGS and/or OPTIM depending on which compiler we
-# are going to use. This is easy, since this can be gleamed from
-# Makefile.config
-#
+## Now we do some OS specific adjustments... for some OSs, we need
+## to adjust CFLAGS and/or OPTIM depending on which compiler we
+## are going to use. This is easy, since this can be gleamed from
+## Makefile.config
+##
case "$OS" in
'ULTRIX')
if [ "$TCC" = "cc" ]; then
@@ -819,19 +871,17 @@
esac
####################################################################
-# OK, now we can write OPTIM
-#
+## OK, now we can write OPTIM
+##
if [ "x$TOPTIM" = "x" ]; then
echo "OPTIM=$OPTIM" >> Makefile.config
fi
####################################################################
-# Now we do some general checks and some intelligent Configuration
-# control.
+## Now we do some general checks and some intelligent Configuration
+## control.
-#
# Use TestCompile to look for various LIBS
-#
case "$PLAT" in
*-linux*)
# newer systems using glibc 2.x need -lcrypt
@@ -852,12 +902,10 @@
;;
esac
-#
# Now SOCKS4.
-# NOTE: We assume that if they are using SOCKS4, then they've
-# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required,
-# otherwise we assume "-L/usr/local/lib -lsocks"
-#
+# NOTE: We assume that if they are using SOCKS4, then they've
+# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required,
+# otherwise we assume "-L/usr/local/lib -lsocks"
if [ "$RULE_SOCKS4" = "yes" ]; then
# Set flag and check Makefile for -lsocks line
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
@@ -872,57 +920,57 @@
fi
####################################################################
-# Find out what modules we want and try and configure things for them
-# Module lines can look like this:
-#
-# Module name_module some/path/mod_name[.[oa]]
-# AddModule some/path/mod_name[.[oa]]
-#
-# In both cases, the some/path can either be an arbitrary path (including
-# an absolute path), or a path like "modules/DIR", in which case we _might_
-# auto-generate a Makefile in modules/DIR (see later).
-#
-# The first case is the original style, where we give the module's
-# name as well as it's binary file location - either a .o or .a.
-#
-# The second format is new, and means we do not repeat the module
-# name, which is already part of the module source or definition.
-# The way we find the module name (and other optional information about
-# the module) is like this:
-#
-# 1 If extension is not given or is .c, assume .o was given and goto 3
-# 2 If extension if .module, go to D1
-# 3 If extension is .o, look for a corresponding .c file and if
-# found, go to C1
-# 4 If no .c file was found, look for a .module file (Apache module
-# definition file). If found, go to D1
-# 5 Assume module name is the "name" part of "mod_name", as in
-# name_module.
-#
-# If a C file is found:
-#
-# C1 Look for module name given by an MODULE: line (e.g. MODULE: name_module)
-# If found assume module contains a definition, and go to D1
-# C2 If not found, look for a module name given on the declaration of the
-# module structure (e.g. module name_module).
-# C3 If neither given, go to 4 above.
-#
-# If a definition file is found, or a .c file includes a module definition:
-#
-# D1 Get the module name from the MODULE: name= line
-# D2 Get other module options (libraries etc). To be done later.
-#
-
-# For now, we will convert the AddModule lines into Module format
-# lines, so the rest of Configure can do its stuff without too much
-# additional hackery. It would be nice to reduce the number of times
-# we have to awk the $tmpfile, though.
-
-# MODFILES contains a list of module filenames (could be .c, .o, .so, .a
-# or .module files) from AddModule lines only
-# MODDIRS contains a list of subdirectories under 'modules' which
-# contain modules we want to build from both AddModule and Module
-# lines
+## Find out what modules we want and try and configure things for them
+## Module lines can look like this:
+##
+## Module name_module some/path/mod_name[.[oa]]
+## AddModule some/path/mod_name[.[oa]]
+##
+## In both cases, the some/path can either be an arbitrary path (including
+## an absolute path), or a path like "modules/DIR", in which case we _might_
+## auto-generate a Makefile in modules/DIR (see later).
+##
+## The first case is the original style, where we give the module's
+## name as well as it's binary file location - either a .o or .a.
+##
+## The second format is new, and means we do not repeat the module
+## name, which is already part of the module source or definition.
+## The way we find the module name (and other optional information about
+## the module) is like this:
+##
+## 1 If extension is not given or is .c, assume .o was given and goto 3
+## 2 If extension if .module, go to D1
+## 3 If extension is .o, look for a corresponding .c file and if
+## found, go to C1
+## 4 If no .c file was found, look for a .module file (Apache module
+## definition file). If found, go to D1
+## 5 Assume module name is the "name" part of "mod_name", as in
+## name_module.
+##
+## If a C file is found:
+##
+## C1 Look for module name given by an MODULE: line (e.g. MODULE:
name_module)
+## If found assume module contains a definition, and go to D1
+## C2 If not found, look for a module name given on the declaration of the
+## module structure (e.g. module name_module).
+## C3 If neither given, go to 4 above.
+##
+## If a definition file is found, or a .c file includes a module definition:
+##
+## D1 Get the module name from the MODULE: name= line
+## D2 Get other module options (libraries etc). To be done later.
+##
+##
+## For now, we will convert the AddModule lines into Module format
+## lines, so the rest of Configure can do its stuff without too much
+## additional hackery. It would be nice to reduce the number of times
+## we have to awk the $tmpfile, though.
+
+## MODFILES contains a list of module filenames (could be .c, .o, .so, .a
+## or .module files) from AddModule lines only
+## MODDIRS contains a list of subdirectories under 'modules' which
+## contain modules we want to build from both AddModule and Module
+## lines
echo " + adding selected modules"
@@ -958,14 +1006,11 @@
}
}'`
-#
# Now autoconfigure each of the modules specified by AddModule.
# Use tmpfile2 for the module definition file, and tmpfile3 for the
# shell commands to be executed for this module.
-#
for modfile in $MODFILES ; do
-# echo Trying to find $modfile
rm -f $tmpfile2 $tmpfile3
modname=''
@@ -977,8 +1022,6 @@
# modbase is the path+filename without extension, ext is the
# extension given, or if none, o
-# echo bas=$modbase ext=$ext
-
if [ -r $modbase.module ] ; then
$CAT $modbase.module > $tmpfile2
else
@@ -1003,7 +1046,7 @@
&& grep "ConfigEnd" $tmpfile2 > /dev/null; then
sed '1,/ConfigStart/d;/ConfigEnd/,$d' $tmpfile2 > \
$tmpfile3
- echo " o $modname uses ConfigStart/End:"
+ echo " o $modname uses ConfigStart/End"
if [ "$RULE_PARANOID" = "yes" ]; then
sed 's/^/>> /' $tmpfile3
fi
@@ -1019,32 +1062,31 @@
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi
if [ $ext != so ]; then
-# echo "Adding Module $modname $modbase.$ext"
echo "Module $modname $modbase.$ext" >>$tmpfile
fi
done
-
# $tmpfile now contains Module lines for all the modules we want
-#
-# Now HS's POSIX regex implementation if needed/wanted. We do it
-# now since AddModule may have changed it
-#
+####################################################################
+## Now HS's POSIX regex implementation if needed/wanted. We do it
+## now since AddModule may have changed it
+##
if [ "$RULE_WANTHSREGEX" = "yes" ]; then
REGLIB="regex/libregex.a"
SUBDIRS="$SUBDIRS regex"
CFLAGS="$CFLAGS -DUSE_HSREGEX"
fi
-#
-# Now the definition of HIDE if needed/wanted.
-#
+####################################################################
+## Now the definition of HIDE if needed/wanted.
+##
if [ "$RULE_HIDE" = "yes" ]; then
CFLAGS="$CFLAGS -DHIDE"
fi
-# create modules.c
-
+####################################################################
+## Now create modules.c
+##
sed 's/_module//' $tmpfile | awk >modules.c '
BEGIN {
modules[n++] = "core"
@@ -1070,24 +1112,27 @@
}
print " NULL"
print "};"
+ print ""
print "module *preloaded_modules[] = {"
for (i = 0; i < pn; ++i) {
printf " &%s_module,\n", pmodules[i]
}
print " NULL"
print "};"
+ print ""
}'
-# figure out which module dir require use to autocreate a Makefile.
-# for these dirs we must not list the object files from the AddModule
-# lines individually since the auto-generated Makefile will create
-# a library called libMODDIR.a for it (MODDIR is the module dir
-# name). We create two variable here:
-#
-# AUTODIRS Space separated list of module directories, relative to
-# src
-# AUTOLIBS Space separated list of auto-generated library files
-
+####################################################################
+## figure out which module dir require use to autocreate a Makefile.
+## for these dirs we must not list the object files from the AddModule
+## lines individually since the auto-generated Makefile will create
+## a library called libMODDIR.a for it (MODDIR is the module dir
+## name). We create two variable here:
+##
+## AUTODIRS Space separated list of module directories, relative to
+## src
+## AUTOLIBS Space separated list of auto-generated library files
+##
for moddir in $MODDIRS
do
if [ -f modules/$moddir/Makefile.tmpl ] ; then
@@ -1101,9 +1146,10 @@
fi
done
-# Add the module targets to the Makefile. Do not add individual object
-# targets for auto-generated directories.
-
+####################################################################
+## Add the module targets to the Makefile. Do not add individual object
+## targets for auto-generated directories.
+##
$CAT > $awkfile <<EOF1
BEGIN {
split ("$AUTODIRS", tmp, " ")
@@ -1134,9 +1180,10 @@
EOF2
awk -f $awkfile >>Makefile <$tmpfile
-# Now add the auto-generated library targets. Need to use awk so we
-# don't hang a continuation on the last line.
-
+####################################################################
+## Now add the auto-generated library targets. Need to use awk so we
+## don't hang a continuation on the last line.
+##
$CAT > $awkfile <<EOF3
BEGIN {
split ("$AUTOLIBS", libs)
@@ -1155,51 +1202,61 @@
}
EOF4
awk -f $awkfile >>Makefile </dev/null
+echo "" >>Makefile
-#
-# Now add -DSERVER_SUBVERSION if $SUBVERSION is set
-#
+####################################################################
+## Now add the target for the main Makefile
+##
+echo "TARGET=$TARGET" >> Makefile
+echo "" >> Makefile
+
+####################################################################
+## Now add -DSERVER_SUBVERSION if $SUBVERSION is set
+##
if [ "x$SUBVERSION" != "x" ] ; then
SUBVERSION=`echo $SUBVERSION | sed 's/^ +//'`
CFLAGS="$CFLAGS -DSERVER_SUBVERSION=\\\"$SUBVERSION\\\""
fi
####################################################################
-# Continue building Makefile.config.
-#
-echo >> Makefile
+## Determine GNU Make variant because
+## it uses ugly looking built-in directory walk messages
+## while we are already using our own messages
+##
+if [ ".`make -v 2>/dev/null | grep 'GNU Make'`" = . ]; then
+ MFLAGS_STATIC=
+else
+ MFLAGS_STATIC=--no-print-directory
+fi
+
+####################################################################
+## Continue building Makefile.config.
+##
echo "CFLAGS1=$CFLAGS">> Makefile.config
+echo "INCDIR=\$(SRCDIR)/include" >>Makefile.config
+echo "INCLUDES0=-I\$(SRCDIR)/$OSDIR -I\$(SRCDIR)/include">> Makefile.config
echo "INCLUDES1=$INCLUDES">> Makefile.config
-
-INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR include"
-incprefix="-I"
-for depth in 0 1 2; do
- incvar="INCLUDES_DEPTH${depth}="
- for i in $INCLUDES_AUTODEPTH; do
- incvar="$incvar${incprefix}$i "
- done
- echo "$incvar" >>Makefile.config
- incprefix="${incprefix}../"
-done
-
echo "LIBS1=$LIBS">> Makefile.config
echo "LDFLAGS1=$LDFLAGS">> Makefile.config
echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config
+echo "MFLAGS_STATIC=$MFLAGS_STATIC">> Makefile.config
echo "REGLIB=$REGLIB">> Makefile.config
echo "RANLIB=$RANLIB">> Makefile.config
echo "SHELL=$SHELL">> Makefile.config
echo "OSDIR=$OSDIR">> Makefile.config
echo "SUBDIRS=$SUBDIRS">> Makefile.config
-echo "TARGET=$TARGET" >> Makefile.config
-echo >> Makefile.config
-echo "#### End of Configure created section ####">> Makefile.config
+echo "##" >> Makefile.config
+echo "## (End of automatically generated section)">> Makefile.config
+echo "##" >> Makefile.config
+echo "" >> Makefile.config
####################################################################
-# Continue building include/ap_config.h
-#
-# We pick out all -D's from CFLAGS and create ap_config.h which
-# can be used by external modules needing to include Apache
-# header files.
+## Continue building include/ap_config.h
+##
+## We pick out all -D's from CFLAGS and create ap_config.h which
+## can be used by external modules needing to include Apache
+## header files.
+##
for cflag in $CFLAGS; do
echo $cflag | sed 's/\\\"/\"/g' >>$tmpconfig ;
done
@@ -1214,9 +1271,9 @@
'
####################################################################
-# Use TestCompile to see if $(CC) is ANSI and as a "final" sanity
-# check
-#
+## Use TestCompile to see if $(CC) is ANSI and as a "final" sanity
+## check
+##
echo " + doing sanity check on compiler and options"
if ./helpers/TestCompile sanity; then
:
@@ -1232,23 +1289,27 @@
fi
####################################################################
-# Now (finish) creating the makefiles
-#
+## Now (finish) creating the makefiles
+##
+
# ./Makefile
-#
$CAT Makefile.config >> Makefile
sed -e "s#@@Configuration@@#$file#" "Makefile.tmpl" >>Makefile
-#
-# directories to create makefiles in
-#
+# xxx/Makefile
MAKEDIRS="support main ap regex $OSDIR"
for dir in $MAKEDIRS ; do
echo Creating Makefile in $dir
- $CAT Makefile.config $dir/Makefile.tmpl > $dir/Makefile
+ mfhead $dir > $dir/Makefile
+ $CAT Makefile.config $dir/Makefile.tmpl |\
+ sed -e "s:^SRCDIR=.*:SRCDIR=`fp2rp $dir`:" >> $dir/Makefile
done
-$CAT Makefile.config >modules/Makefile
+####################################################################
+## Now create the modules/Makefile
+##
+mfhead modules > modules/Makefile
+$CAT Makefile.config | sed -e 's:^SRCDIR=.*:SRCDIR=..:' >> modules/Makefile
$CAT << EOF >> modules/Makefile
MODULES=$MODDIRS
@@ -1257,20 +1318,33 @@
default: all
all clean depend ::
- for i in \$(MODULES); do (cd \$\$i && \$(MAKE) CC='\$(CC)'
AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; done
+ @for i in \$(MODULES); do \\
+ echo "===> modules/\$\$i"; \\
+ (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) CC='\$(CC)'
AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\
+ echo "<=== modules/\$\$i"; \\
+ done
EOF
+####################################################################
+## Now create modules/xxx/Makefile
+##
for moddir in $AUTODIRS ; do
echo "Creating Makefile in $moddir"
- $CAT Makefile.config > $moddir/Makefile
+ mfhead $moddir > $moddir/Makefile
+ $CAT Makefile.config |\
+ sed -e "s:^SRCDIR=.*:SRCDIR=`fp2rp $moddir`:" >> $moddir/Makefile
$CAT << 'EOF' >> $moddir/Makefile
+##
+## Default Makefile options from Configure script
+## (Begin of automatically generated section)
+##
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
-INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-INCDIR=../../include
+INCDIR=$(SRCDIR)/include
EOF
if [ -f $moddir/Makefile.libdir ]; then
basedir=`echo $moddir | sed '[EMAIL PROTECTED]/]*/@@g'`
@@ -1339,9 +1413,16 @@
rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB)
$(OBJS) $(SHLIBS) $(SHLIBS_OBJ): Makefile
+
EOF
fi
+ $CAT << 'EOF' >> $moddir/Makefile
+##
+## (End of automatically generated section)
+##
+EOF
$CAT >> $moddir/Makefile < $moddir/Makefile.tmpl
done
+
1.85 +13 -12 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Makefile.tmpl 1998/03/17 08:27:57 1.84
+++ Makefile.tmpl 1998/03/17 15:42:24 1.85
@@ -1,12 +1,7 @@
-# Apache makefile template (well, suffix).
-
-# This is combined with the information in the "Configuration" file
-# by the configure script to make the actual Makefile.
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
-INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES)
-INCDIR=include
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
OBJS= \
@@ -33,19 +28,25 @@
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) -o $(TARGET)
buildmark.o $(OBJS) $(REGLIB) $(LIBS)
subdirs:
- for i in $(SUBDIRS); do \
- ( cd $$i && $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)') || exit 1; \
+ @for i in $(SUBDIRS); do \
+ echo "===> $$i"; \
+ ( cd $$i && $(MAKE) $(MFLAGS_STATIC) CC='$(CC)'
AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \
+ echo "<=== $$i"; \
done
support: support-dir
support-dir:
- cd support; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)'
+ @echo "===> support"; \
+ cd support; $(MAKE) $(MFLAGS_STATIC) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)'; \
+ echo "<=== support"
clean:
- rm -f $(TARGET) *.o *.bak
- for i in $(SUBDIRS); do \
- ( cd $$i && $(MAKE) $@ ) || exit 1; \
+ rm -f $(TARGET) *.o
+ @for i in $(SUBDIRS); do \
+ echo "===> $$i"; \
+ ( cd $$i && $(MAKE) $(MFLAGS_STATIC) $@ ) || exit 1; \
+ echo "<=== $$i"; \
done
# We really don't expect end users to use this rule. It works only with
1.17 +1 -2 apache-1.3/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.tmpl 1998/03/17 08:27:55 1.16
+++ Makefile.tmpl 1998/03/17 15:42:26 1.17
@@ -1,8 +1,7 @@
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
-INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-INCDIR=../include
LIB=libap.a
1.19 +1 -2 apache-1.3/src/main/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.tmpl 1998/03/17 08:27:56 1.18
+++ Makefile.tmpl 1998/03/17 15:42:27 1.19
@@ -5,9 +5,8 @@
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
-INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-INCDIR=../include
LIB= libmain.a
1.4 +6 -7 apache-1.3/src/modules/example/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/example/Makefile.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.tmpl 1998/02/22 04:37:13 1.3
+++ Makefile.tmpl 1998/03/17 15:42:28 1.4
@@ -1,5 +1,4 @@
# default Makefile.tmpl to force Configure to create a Makefile
-INCDIR=../../include
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
@@ -17,9 +16,9 @@
$(OBJS): Makefile
# DO NOT REMOVE
-mod_example.o: mod_example.c ../../include/httpd.h \
- ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
- ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
- ../../include/http_config.h ../../include/http_core.h \
- ../../include/http_log.h ../../include/http_main.h \
- ../../include/http_protocol.h ../../include/util_script.h
+mod_example.o: mod_example.c $(INCDIR)/httpd.h \
+ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
+ $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/util_script.h
1.5 +0 -2 apache-1.3/src/modules/experimental/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/experimental/Makefile.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.tmpl 1998/03/17 08:27:58 1.4
+++ Makefile.tmpl 1998/03/17 15:42:29 1.5
@@ -1,5 +1,3 @@
-# default Makefile.tmpl to force Configure to create a Makefile
-INCDIR=../../include
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
1.4 +0 -2 apache-1.3/src/modules/extra/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/extra/Makefile.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.tmpl 1998/02/22 04:37:15 1.3
+++ Makefile.tmpl 1998/03/17 15:42:30 1.4
@@ -1,5 +1,3 @@
-# default Makefile.tmpl to force Configure to create a Makefile
-INCDIR=../../include
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
1.9 +0 -2 apache-1.3/src/modules/proxy/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.tmpl 1998/03/17 08:27:59 1.8
+++ Makefile.tmpl 1998/03/17 15:42:31 1.9
@@ -8,8 +8,6 @@
mod_proxy.so-o \
proxy_cache.so-o proxy_connect.so-o proxy_ftp.so-o proxy_http.so-o
proxy_util.so-o
-INCDIR=../../include
-
all: lib
lib: $(LIB)
1.12 +0 -1 apache-1.3/src/modules/standard/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.tmpl 1998/03/17 08:28:00 1.11
+++ Makefile.tmpl 1998/03/17 15:42:32 1.12
@@ -1,4 +1,3 @@
-INCDIR=../../include
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
1.6 +0 -2 apache-1.3/src/modules/test/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/test/Makefile.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.tmpl 1998/03/17 08:28:01 1.5
+++ Makefile.tmpl 1998/03/17 15:42:33 1.6
@@ -1,5 +1,3 @@
-# default Makefile.tmpl to force Configure to create a Makefile
-INCDIR=../../include
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
1.4 +1 -2 apache-1.3/src/os/bs2000/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.tmpl 1998/02/22 04:45:47 1.3
+++ Makefile.tmpl 1998/03/17 15:42:34 1.4
@@ -1,8 +1,7 @@
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
-INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../include
OBJS= os.o os-inline.o ebcdic.o
1.4 +1 -2 apache-1.3/src/os/emx/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.tmpl 1998/02/22 04:45:48 1.3
+++ Makefile.tmpl 1998/03/17 15:42:36 1.4
@@ -1,8 +1,7 @@
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
-INCLUDES=$(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../include
OBJS= os.o os-inline.o
COPY= os.h os-inline.c
1.15 +1 -2 apache-1.3/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.tmpl 1998/03/17 08:28:02 1.14
+++ Makefile.tmpl 1998/03/17 15:42:40 1.15
@@ -1,8 +1,7 @@
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
-INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../include
OBJS= os.o os-inline.o
1.6 +5 -3 apache-1.3/src/regex/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/Makefile.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.tmpl 1998/02/12 10:15:29 1.5
+++ Makefile.tmpl 1998/03/17 15:42:41 1.6
@@ -1,20 +1,22 @@
+
# You probably want to take -DREDEBUG out of CFLAGS, and put something like
# -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of
# internal assertion checking and some debugging facilities).
# Put -Dconst= in for a pre-ANSI compiler.
# Do not take -DPOSIX_MISTAKE out.
# REGCFLAGS isn't important to you (it's for my use in some special
contexts).
-CFLAGS=-I. -I../include -DPOSIX_MISTAKE $(AUX_CFLAGS)
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
+CFLAGS=-I. $(INCLUDES) $(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) -DPOSIX_MISTAKE
# If you have a pre-ANSI compiler, put -o into MKHFLAGS. If you want
# the Berkeley __P macro, put -b in.
MKHFLAGS=
# Flags for linking but not compiling, if any.
-LDFLAGS=
+LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L$(SRCDIR)/ap
# Extra libraries for linking, if any.
-LIBS=
+LIBS=$(EXTRA_LIBS) $(LIBS1) -lap
# Internal stuff, should not need changing.
OBJPRODN=regcomp.o regexec.o regerror.o regfree.o
1.12 +2 -7 apache-1.3/src/support/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.tmpl 1998/03/17 12:46:41 1.11
+++ Makefile.tmpl 1998/03/17 15:42:42 1.12
@@ -1,13 +1,8 @@
-# Apache makefile template (well, suffix).
-
-# This is combined with the information in the "Configuration" file
-# by the configure script to make the actual Makefile.
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1) -lap
-INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
-LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L../ap
-INCDIR=../include
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
+LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L$(SRCDIR)/ap
TARGETS=htpasswd htdigest rotatelogs logresolve ab
