cvs commit: apachen/src/support Makefile.tmpl
coar97/11/15 11:04:54 Modified:htdocs/manual new_features_1_3.html src CHANGES Configure Makefile.tmpl src/main http_main.c src/support Makefile.tmpl Added: src/ap .cvsignore Makefile.tmpl ap_signal.c Log: Create new src/ap sibdirectory for the ap_*() routines, and tweak things to use it. So far only ap_signal() has been moved here, but that's enough to get htdigest to build. Other functions can move here over time. PR: 512, 905, 1252, 1308 Reviewed by: Dean Gaudet, Roy Fielding Revision ChangesPath 1.34 +13 -0 apachen/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apachen/htdocs/manual/new_features_1_3.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- new_features_1_3.html 1997/11/12 23:29:18 1.33 +++ new_features_1_3.html 1997/11/15 19:04:44 1.34 @@ -469,6 +469,19 @@ module has also been modified to display years using four digits in FancyIndexed directory listings. + + ap_*() Routines Moving to a Separate Library + + There are a number of functions and routines that have been developed + for the Apache project that supplement or supersede library routines + that differ from one operating system to another. While most of these + are used only by the Apache server itself, some are referenced by + supporting applications (such as htdigest), and these + other applications would fail to build because the routines were built + only into the server. These routines are now being migrated to a + separate subdirectory and library so they can be used by other + applications than just the server. + 1.513 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.512 retrieving revision 1.513 diff -u -r1.512 -r1.513 --- CHANGES 1997/11/15 03:29:55 1.512 +++ CHANGES 1997/11/15 19:04:46 1.513 @@ -1,5 +1,9 @@ Changes with Apache 1.3b3 + *) Start separating the ap_*() routines into their own library, so they + can be used by items in src/support among other things. PR#512, 905, + 1252, 1308 [Ken Coar] + *) Give a more informative error when no AuthType is set. [Lars Eilebrecht] 1.171 +2 -2 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- Configure 1997/11/08 21:47:33 1.170 +++ Configure 1997/11/15 19:04:47 1.171 @@ -26,7 +26,7 @@ tmpfile2=$tmpfile.2 tmpfile3=$tmpfile.3 awkfile=$tmpfile.4 -SUBDIRS='$(OSDIR) main modules' +SUBDIRS='$(OSDIR) main ap modules' ## Now handle any arguments, which, for now, is -file @@ -1031,7 +1031,7 @@ # # directories to create makefiles in # -MAKEDIRS="support main regex $OSDIR" +MAKEDIRS="support main ap regex $OSDIR" for dir in $MAKEDIRS ; do echo Creating Makefile in $dir cat Makefile.config $dir/Makefile.tmpl > $dir/Makefile 1.72 +2 -1 apachen/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- Makefile.tmpl 1997/11/13 22:25:44 1.71 +++ Makefile.tmpl 1997/11/15 19:04:47 1.72 @@ -12,7 +12,8 @@ modules.o \ $(MODULES) \ main/libmain.a \ - $(OSDIR)/libos.a + $(OSDIR)/libos.a \ + ap/libap.a .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< 1.1 apachen/src/ap/.cvsignore Index: .cvsignore === Makefile 1.1 apachen/src/ap/Makefile.tmpl Index: Makefile.tmpl === CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES) LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) INCDIR=../main LIB=libap.a OBJS=ap_signal.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< all: $(LIB) clean: rm -f *.o *.a $(OBJS): Makefile $(LIB): $(OBJS) ar cr $(LIB) $(OBJS) # dependencies ap_signal.o: $(INCDIR)/httpd.h 1.1 apachen/
cvs commit: apachen/src/support Makefile.tmpl
sameer 97/10/22 16:31:26 Modified:src/support Makefile.tmpl Log: Fix builds so that they depend on the .o files and use the .o files to build so that the right .o build rule is used. Submitted by: Sameer Parekh Reviewed by: Dean Gaudet Revision ChangesPath 1.7 +9 -9 apachen/src/support/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/support/Makefile.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -c -u -r1.6 -r1.7 /usr/bin/diff: conflicting specifications of output style --- Makefile.tmpl 1997/10/12 01:19:01 1.6 +++ Makefile.tmpl 1997/10/22 23:31:25 1.7 @@ -15,18 +15,18 @@ all: $(TARGETS) -htpasswd: htpasswd.c - $(CC) $(CFLAGS) htpasswd.c -o htpasswd $(LIBS) +htpasswd: htpasswd.o + $(CC) $(CFLAGS) htpasswd.o -o htpasswd $(LIBS) -htdigest: htdigest.c - $(CC) $(CFLAGS) htdigest.c -o htdigest $(LIBS) +htdigest: htdigest.o + $(CC) $(CFLAGS) htdigest.o -o htdigest $(LIBS) -rotatelogs: rotatelogs.c - $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.c -o rotatelogs +rotatelogs: rotatelogs.o + $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.o -o rotatelogs -logresolve: logresolve.c - $(CC) $(INCLUDES) $(CFLAGS) logresolve.c -o logresolve $(LIBS) +logresolve: logresolve.o + $(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LIBS) clean: - rm -f $(TARGETS) + rm -f $(TARGETS) *.o
cvs commit: apachen/src/support Makefile.tmpl httpd_monitor.c
pcs 97/08/23 05:10:44 Modified:src/support Makefile.tmpl Removed: src/support httpd_monitor.c Log: Remove httpd_monitor which now longer works with current scoreboard format, and use of a file for the scoreboard is bad anyway. Revision ChangesPath 1.5 +1 -4 apachen/src/support/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/support/Makefile.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.tmpl 1997/07/20 23:44:49 1.4 +++ Makefile.tmpl 1997/08/23 12:10:42 1.5 @@ -11,7 +11,7 @@ .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $< -TARGETS=htpasswd htdigest httpd_monitor rotatelogs logresolve +TARGETS=htpasswd htdigest rotatelogs logresolve all: $(TARGETS) @@ -20,9 +20,6 @@ htdigest: htdigest.c $(CC) $(CFLAGS) htdigest.c -o htdigest $(LIBS) - -httpd_monitor: httpd_monitor.c - $(CC) $(INCLUDES) $(CFLAGS) httpd_monitor.c -o httpd_monitor rotatelogs: rotatelogs.c $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.c -o rotatelogs
cvs commit: apachen/src/support Makefile.tmpl
pcs 97/07/26 14:08:09 Modified:src Configure Makefile.tmpl Log: Source re-organisation. Configure can get module info from source file or separet file for binary modules. Revision ChangesPath 1.123 +290 -108 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- Configure 1997/07/25 02:10:46 1.122 +++ Configure 1997/07/26 21:06:47 1.123 @@ -21,6 +21,8 @@ ## file=Configuration tmpfile=htconf.$$ +tmpfile2=$tmpfile.2 +tmpfile3=$tmpfile.3 makefile_tmpl=Makefile.tmpl @@ -76,6 +78,7 @@ # we bail out # if egrep -v '^%?Module[ ]+[A-Za-z0-9_]+[]+[^]+$' $tmpfile \ + | egrep -v '^%?AddModule[ ]+[^]+$' \ | grep -v = > /dev/null then echo "Syntax error --- The configuration file is used only to" @@ -93,39 +96,6 @@ if [ -f modules.c ] ; then mv modules.c modules.c.bak; fi -# Start building the modules.c file from what was included -# in Configuration - -sed -e 's/_module//' $tmpfile | awk >modules.c '\ - BEGIN { modules[n++] = "core" ; pmodules[pn++] = "core"} \ - /^Module/ { modules[n++] = $2 ; pmodules[pn++] = $2 } \ - /^%Module/ { pmodules[pn++] = $2 } \ - END { print "/* modules.c --- automatically generated by Apache"; \ - print " * configuration script. DO NOT HAND EDIT!"; \ - print " */"; \ - print ""; \ - print "#include \"httpd.h\""; \ - print "#include \"http_config.h\""; \ - print ""; \ - for (i = 0; i < pn; ++i) { \ - printf ("extern module %s_module;\n", pmodules[i]); \ - } \ - print ""; \ - print "module *prelinked_modules[] = {"; \ - for (i = 0; i < n; ++i) { \ - printf " &%s_module,\n", modules[i]; \ - } \ - print " NULL"; \ - print "};"; \ - print "module *preloaded_modules[] = {"; \ - for (i = 0; i < pn; ++i) { \ - printf " &%s_module,\n", pmodules[i]; \ - } \ - print " NULL"; \ - print "};"; \ - }' - - # Start creating the Makefile. We add some comments and # then fold in the modules that were included in Configuration # @@ -136,17 +106,6 @@ echo "# is re-run" >> Makefile echo "#" >> Makefile -awk >>Makefile <$tmpfile '\ - /^Module/ { modules[n++] = $3 } \ - /^%Module/ { modules[n++] = $3 } \ - END { print "MODULES=\\"; \ - for (i = 0; i < n; ++i) { \ - if (i < n-1) printf (" %s \\\n", modules[i]); \ - else printf (" %s\n", modules[i]); \ - } \ - print "" \ - }' - # Now we create a stub file, called Makefile.config, which # just includes those assignments (eg: CC=gcc) in Configuration @@ -196,6 +155,9 @@ PLAT=`./helpers/GuessOS` +SHELL="/bin/sh" +OSDIR="os/unix" + case "$PLAT" in *MPE/iX*) OS='MPE/iX' @@ -536,6 +498,7 @@ # Show user what OS we came up with # +SRCDIR=`pwd` echo " + configured for $OS platform" @@ -662,45 +625,6 @@ fi fi -# -# Now HS's POSIX regex implementation if needed/wanted -# -if [ "$RULE_WANTHSREGEX" = "yes" ]; then -REGLIB="regex/libregex.a" -INCLUDES="$INCLUDES -Iregex" -fi - -# -# 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" -# -if [ "$RULE_SOCKS4" = "yes" ]; then -# Set flag and check Makefile for -lsocks line -CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect" -CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname" -if grep "EXTRA_" Makefile | grep "\-lsocks" > /dev/null; then : ; -else - LIBS="$LIBS -L/usr/local/lib -lsocks" -fi -if [ "$OS" = "Solaris 2" ]; then - LIBS="$LIBS -lresolv" -fi -fi - - -# Continue building Makefile.config. We can add all flags with -# the exception of LIBS at this point -# -echo "CFLAGS1=$CFLAGS">> Makefile.config -echo "INCLUDES1=$INCLUDES">> Makefile.config -echo "LDFLAGS1=$LDFLAGS">> Makefile.config -echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config -echo "REGLIB=$REGLIB">> Makefile.config -echo