httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@hyperreal.org
Subject cvs commit: apache-2.0/mpm/src/modules/standard Makefile.tmpl
Date Fri, 16 Jul 1999 18:24:27 GMT
ben         99/07/16 11:24:27

  Modified:    mpm/src  Configure
               mpm/src/main Makefile.tmpl
               mpm/src/modules/mpm/prefork Makefile.tmpl
               mpm/src/modules/standard Makefile.tmpl
  Log:
  Make dependencies work again.
  
  Revision  Changes    Path
  1.13      +14 -14    apache-2.0/mpm/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/Configure,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Configure	1999/07/12 22:51:06	1.12
  +++ Configure	1999/07/16 18:24:23	1.13
  @@ -790,12 +790,25 @@
   SUBDIRS="$OSDIR $SUBDIRS"
   
   ####################################################################
  +## Now handle the MPM implementation. Default to 1.3 prefork
  +##
  +if [ "x$RULE_MPM_METHOD" = "xdefault" ]; then
  +    if [ "x$DEF_MPM_METHOD" = "x" ]; then
  +	RULE_MPM_METHOD="prefork"
  +    else
  +	RULE_MPM_METHOD="$DEF_MPM_METHOD"
  +    fi
  +fi
  +##
  +MPM_METHOD="$RULE_MPM_METHOD"
  +
  +####################################################################
   # Continue building the stub file
   # Set variables as soon as possible so that TestCompile can use them
   ##
   echo >>Makefile.config "OSDIR=\$(SRCDIR)/$OSDIR"
   echo >>Makefile.config "INCDIR=\$(SRCDIR)/include"
  -echo >>Makefile.config "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR)"
  +echo >>Makefile.config "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR) -I\$(SRCDIR)/modules/mpm/$MPM_METHOD"
   echo >>Makefile.config "SHELL=$SHELL"
   
   ####################################################################
  @@ -808,19 +821,6 @@
   		RULE_WANTHSREGEX=$DEF_WANTHSREGEX
   	fi
   fi
  -
  -####################################################################
  -## Now handle the MPM implementation. Default to 1.3 prefork
  -##
  -if [ "x$RULE_MPM_METHOD" = "xdefault" ]; then
  -    if [ "x$DEF_MPM_METHOD" = "x" ]; then
  -	RULE_MPM_METHOD="prefork"
  -    else
  -	RULE_MPM_METHOD="$DEF_MPM_METHOD"
  -    fi
  -fi
  -##
  -MPM_METHOD="$RULE_MPM_METHOD"
   
   ####################################################################
   ## Now we determine the C-compiler and optimization level
  
  
  
  1.13      +0 -8      apache-2.0/mpm/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.tmpl	1999/07/11 16:36:51	1.12
  +++ Makefile.tmpl	1999/07/16 18:24:25	1.13
  @@ -153,14 +153,6 @@
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/ap_hooks.h $(INCDIR)/ap_listen.h $(INCDIR)/http_log.h
  -mpm_prefork.o: mpm_prefork.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
  - $(INCDIR)/http_log.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \
  - $(INCDIR)/scoreboard_prefork.h
   rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  
  
  
  1.8       +3 -4      apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.tmpl	1999/07/16 05:30:31	1.7
  +++ Makefile.tmpl	1999/07/16 18:24:25	1.8
  @@ -59,10 +59,9 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h mpm_default.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h mpm_default.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \
  
  
  
  1.7       +3 -2      apache-2.0/mpm/src/modules/standard/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/Makefile.tmpl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.tmpl	1999/07/11 16:36:51	1.6
  +++ Makefile.tmpl	1999/07/16 18:24:26	1.7
  @@ -47,7 +47,8 @@
    $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/ap_md5.h
  + $(INCDIR)/http_protocol.h $(INCDIR)/ap_md5.h \
  + $(INCDIR)/http_request.h
   mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  @@ -266,7 +267,7 @@
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
    $(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \
  - $(INCDIR)/util_script.h $(INCDIR)/scoreboard.h \
  + $(INCDIR)/util_script.h ../../modules/mpm/prefork/scoreboard.h \
    $(INCDIR)/http_log.h
   mod_unique_id.o: mod_unique_id.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  
  
  

Mime
View raw message