coar 98/02/01 08:33:13
Modified: src CHANGES Configure
src/regex Makefile.tmpl
Log:
Final phase of the move of .h files to src/include.
Revision Changes Path
1.610 +10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -r1.609 -r1.610
--- CHANGES 1998/02/01 04:54:45 1.609
+++ CHANGES 1998/02/01 16:33:08 1.610
@@ -1,5 +1,15 @@
Changes with Apache 1.3b4
+ *) Yet another rearrangement of the source tree.. now all the common
+ header files are in the src/include directory. The -Imain -Iap
+ references in Makefiles have been changed to the simpler -Iinclude
+ instead. In addition to simplifying the build a little bit, this
+ also makes it clear when a module is referencing something in a
+ other than kosher manner (e.g., the proxy including mod_mime.h).
+ Module-private header files (the proxy, mod_mime, the regex library,
+ and mod_rewrite) have not been moved to src/include; nor have
+ the OS-abstraction files.
+
*) Fix a bug where r->hostname didn't have the :port stripped
from it. [Dean Gaudet]
1.180 +0 -2 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- Configure 1998/02/01 15:56:14 1.179
+++ Configure 1998/02/01 16:33:10 1.180
@@ -873,7 +873,6 @@
if [ "$RULE_WANTHSREGEX" = "yes" ]; then
REGLIB="regex/libregex.a"
SUBDIRS="$SUBDIRS regex"
-# INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH regex"
fi
# create modules.c
@@ -991,7 +990,6 @@
echo "CFLAGS1=$CFLAGS">> Makefile.config
echo "INCLUDES1=$INCLUDES">> Makefile.config
-#INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR include"
incprefix="-I"
for depth in 0 1 2; do
1.3 +6 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.tmpl 1997/11/16 01:20:38 1.2
+++ Makefile.tmpl 1998/02/01 16:33:12 1.3
@@ -4,7 +4,7 @@
# 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. -DPOSIX_MISTAKE $(AUX_CFLAGS)
+CFLAGS=-I. -I../include -DPOSIX_MISTAKE $(AUX_CFLAGS)
# If you have a pre-ANSI compiler, put -o into MKHFLAGS. If you want
# the Berkeley __P macro, put -b in.
@@ -46,16 +46,16 @@
rm -f *.o
# stuff to build regex.h
-REGEXH=regex.h
+REGEXH=../include/regex.h
REGEXHSRC=regex2.h $(REGSRC)
$(REGEXH): $(REGEXHSRC) mkh
- sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.h
+ sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) > $(REGEXH)
# cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h
# rm -f regex.tmp
# dependencies
-$(OBJPRODN) debug.o: utils.h regex.h regex2.h
+$(OBJPRODN) debug.o: utils.h $(REGEXH) regex2.h
regcomp.o: cclass.h cname.h regcomp.ih
regexec.o: engine.c engine.ih
regerror.o: regerror.ih
@@ -105,7 +105,8 @@
mf.tmp: Makefile
- sed '/^REGEXH=/s/=.*/=regex.h/' Makefile | sed '/#DEL$$/d' >$@
+ sed '/^REGEXH=/s/=.*/=..\/include\\regex.h/' Makefile \
+ | sed '/#DEL$$/d' >$@
DTRH=cclass.h cname.h regex2.h utils.h
PRE=COPYRIGHT README WHATSNEW
