manoj       99/09/23 12:08:23

  Modified:    src      Makefile.tmpl
               src/ap   Makefile.tmpl
               src/main Makefile.tmpl
               src/modules/mpm/dexter Makefile.tmpl
               src/modules/mpm/mpmt_pthread Makefile.tmpl
               src/modules/mpm/prefork Makefile.tmpl
               src/modules/standard Makefile.tmpl
               src/os/os2 Makefile.tmpl
               src/os/unix Makefile.tmpl
  Log:
  Catch more dependencies on APR's old hsregex.h.
  
  Revision  Changes    Path
  1.8       +2 -2      apache-2.0/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.tmpl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -d -u -r1.7 -r1.8
  --- Makefile.tmpl     1999/09/11 20:42:19     1.7
  +++ Makefile.tmpl     1999/09/23 19:07:53     1.8
  @@ -129,13 +129,13 @@
    include/ap_ctype.h include/httpd.h lib/apr/include/apr_general.h \
    lib/apr/include/apr_config.h lib/apr/include/apr_errno.h \
    lib/apr/include/apr_lib.h lib/apr/include/apr_file_io.h \
  - lib/apr/include/hsregex.h include/buff.h include/ap_iol.h \
  + include/buff.h include/ap_iol.h \
    include/ap.h include/apr.h include/util_uri.h
   modules.o: modules.c include/httpd.h include/ap_config.h \
    include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \
    os/unix/os-inline.c include/ap_ctype.h lib/apr/include/apr_general.h \
    lib/apr/include/apr_config.h lib/apr/include/apr_errno.h \
    lib/apr/include/apr_lib.h lib/apr/include/apr_file_io.h \
  - lib/apr/include/hsregex.h include/buff.h include/ap_iol.h \
  + include/buff.h include/ap_iol.h \
    include/ap.h include/apr.h include/util_uri.h include/http_config.h \
    include/ap_hooks.h
  
  
  
  1.6       +6 -6      apache-2.0/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/Makefile.tmpl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -d -u -r1.5 -r1.6
  --- Makefile.tmpl     1999/09/10 14:34:41     1.5
  +++ Makefile.tmpl     1999/09/23 19:07:56     1.6
  @@ -51,7 +51,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  @@ -59,7 +59,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  @@ -73,7 +73,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/ap_hooks.h
   ap_md5c.o: ap_md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  @@ -89,7 +89,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  @@ -97,7 +97,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
   ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  @@ -105,6 +105,6 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  
  
  
  1.6       +17 -17    apache-2.0/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/Makefile.tmpl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -d -u -r1.5 -r1.6
  --- Makefile.tmpl     1999/09/10 14:34:42     1.5
  +++ Makefile.tmpl     1999/09/23 19:07:59     1.6
  @@ -63,7 +63,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.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
  @@ -73,7 +73,7 @@
    $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_general.h \
    ../lib/apr/include/apr_config.h ../lib/apr/include/apr_errno.h \
    ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \
  - ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
    $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   gen_uri_delims.o: gen_uri_delims.c
   http_config.o: http_config.c ../lib/apr/include/apr_portable.h \
  @@ -85,7 +85,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
    $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(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)/http_core.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_request.h \
  @@ -96,7 +96,7 @@
    $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_general.h \
    ../lib/apr/include/apr_config.h ../lib/apr/include/apr_errno.h \
    ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \
  - ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
    $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_connection.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  @@ -108,7 +108,7 @@
   http_core.o: http_core.c ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_file_io.h \
  - ../lib/apr/include/hsregex.h $(INCDIR)/httpd.h \
  + $(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)/buff.h $(INCDIR)/ap_iol.h \
  @@ -124,7 +124,7 @@
   http_log.o: http_log.c ../lib/apr/include/apr_lib.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_file_io.h \
  - ../lib/apr/include/hsregex.h ../lib/apr/include/apr_portable.h \
  + ../lib/apr/include/apr_portable.h \
    ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
    ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
    ../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \
  @@ -139,7 +139,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/ap_mpm.h \
  @@ -150,7 +150,7 @@
    $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_general.h \
    ../lib/apr/include/apr_config.h ../lib/apr/include/apr_errno.h \
    ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \
  - ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(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)/http_core.h \
    $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
  @@ -165,7 +165,7 @@
    $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_general.h \
    ../lib/apr/include/apr_config.h ../lib/apr/include/apr_errno.h \
    ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \
  - ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(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)/http_request.h $(INCDIR)/http_core.h \
  @@ -179,7 +179,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(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)/http_log.h $(INCDIR)/http_vhost.h \
  @@ -192,7 +192,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   listen.o: listen.c ../lib/apr/include/apr_network_io.h \
  @@ -201,7 +201,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
    $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(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
  @@ -210,7 +210,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
    $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h \
  @@ -220,7 +220,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.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_protocol.h \
  @@ -240,7 +240,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
    $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
    $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
    $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h
   util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  @@ -248,7 +248,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(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)/http_main.h $(INCDIR)/http_log.h \
  @@ -263,7 +263,7 @@
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
    ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
    ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
  - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
  + ../lib/apr/include/apr_file_io.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
    uri_delims.h
  
  
  
  1.4       +2 -2      apache-2.0/src/modules/mpm/dexter/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -d -u -r1.3 -r1.4
  --- Makefile.tmpl     1999/09/06 03:11:33     1.3
  +++ Makefile.tmpl     1999/09/23 19:08:01     1.4
  @@ -64,7 +64,7 @@
    ../../../lib/apr/include/apr_errno.h \
    ../../../lib/apr/include/apr_lib.h \
    ../../../lib/apr/include/apr_file_io.h \
  - ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.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 \
  @@ -82,7 +82,7 @@
    ../../../lib/apr/include/apr_errno.h \
    ../../../lib/apr/include/apr_lib.h \
    ../../../lib/apr/include/apr_file_io.h \
  - ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.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 \
  
  
  
  1.9       +3 -3      apache-2.0/src/modules/mpm/mpmt_pthread/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/Makefile.tmpl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -d -u -r1.8 -r1.9
  --- Makefile.tmpl     1999/09/01 14:38:39     1.8
  +++ Makefile.tmpl     1999/09/23 19:08:04     1.9
  @@ -64,7 +64,7 @@
    ../../../lib/apr/include/apr_errno.h \
    ../../../lib/apr/include/apr_lib.h \
    ../../../lib/apr/include/apr_file_io.h \
  - ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.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 \
  @@ -82,7 +82,7 @@
    ../../../lib/apr/include/apr_errno.h \
    ../../../lib/apr/include/apr_lib.h \
    ../../../lib/apr/include/apr_file_io.h \
  - ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.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 \
  @@ -100,7 +100,7 @@
    ../../../lib/apr/include/apr_errno.h \
    ../../../lib/apr/include/apr_lib.h \
    ../../../lib/apr/include/apr_file_io.h \
  - ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(INCDIR)/buff.h \
    $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  
  
  
  1.11      +1 -1      apache-2.0/src/modules/mpm/prefork/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/Makefile.tmpl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -d -u -r1.10 -r1.11
  --- Makefile.tmpl     1999/09/10 14:34:43     1.10
  +++ Makefile.tmpl     1999/09/23 19:08:07     1.11
  @@ -68,7 +68,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - ../../../lib/apr/include/apr_lib.h ../../../lib/apr/include/hsregex.h \
  + ../../../lib/apr/include/apr_lib.h \
    $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
    $(INCDIR)/ap.h $(INCDIR)/apr.h \
    $(INCDIR)/util_uri.h mpm_default.h \
  
  
  
  1.6       +36 -36    apache-2.0/src/modules/standard/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.tmpl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -d -u -r1.5 -r1.6
  --- Makefile.tmpl     1999/09/10 14:34:47     1.5
  +++ Makefile.tmpl     1999/09/23 19:08:10     1.6
  @@ -11,7 +11,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(INCDIR)/buff.h \
    $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  @@ -23,7 +23,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h \
  @@ -42,7 +42,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h
  @@ -52,7 +52,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_protocol.h \
  @@ -69,7 +69,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -87,7 +87,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -105,7 +105,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -122,7 +122,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -139,7 +139,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_conf_globals.h \
  @@ -159,7 +159,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -178,7 +178,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/util_script.h \
  @@ -189,7 +189,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h \
  @@ -208,7 +208,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -225,7 +225,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -243,7 +243,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_connection.h
  @@ -253,7 +253,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h
  @@ -264,7 +264,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_log.h
  @@ -275,7 +275,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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
  @@ -285,7 +285,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h \
  @@ -304,7 +304,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h \
  @@ -322,7 +322,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -340,7 +340,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_log.h
  @@ -351,7 +351,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -368,7 +368,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_log.h
  @@ -378,7 +378,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_log.h \
  @@ -390,7 +390,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h \
  @@ -407,7 +407,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h \
  @@ -425,7 +425,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_conf_globals.h \
  @@ -438,7 +438,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -454,7 +454,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_log.h
  @@ -465,7 +465,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(INCDIR)/buff.h \
    $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  @@ -477,7 +477,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h \
  @@ -496,7 +496,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_log.h
  @@ -507,7 +507,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_request.h
  @@ -518,7 +518,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h
  @@ -529,7 +529,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_core.h
  
  
  
  1.4       +2 -2      apache-2.0/src/os/os2/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/os2/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -d -u -r1.3 -r1.4
  --- Makefile.tmpl     1999/09/11 03:31:20     1.3
  +++ Makefile.tmpl     1999/09/23 19:08:16     1.4
  @@ -54,7 +54,7 @@
    $(INCDIR)/hsregex.h $(SRCDIR)/lib/apr/include/apr_general.h \
    $(SRCDIR)/lib/apr/include/apr_config.h 
$(SRCDIR)/lib/apr/include/apr_errno.h \
    $(SRCDIR)/lib/apr/include/apr_lib.h $(SRCDIR)/lib/apr/include/apr_file_io.h 
\
  - $(SRCDIR)/lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(INCDIR)/buff.h \
    $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
    $(INCDIR)/util_uri.h iol_socket.h
   os-inline.o: os-inline.c $(INCDIR)/ap_config.h \
  @@ -67,6 +67,6 @@
    $(INCDIR)/hsregex.h $(SRCDIR)/lib/apr/include/apr_general.h \
    $(SRCDIR)/lib/apr/include/apr_config.h 
$(SRCDIR)/lib/apr/include/apr_errno.h \
    $(SRCDIR)/lib/apr/include/apr_lib.h $(SRCDIR)/lib/apr/include/apr_file_io.h 
\
  - $(SRCDIR)/lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(INCDIR)/buff.h \
    $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
  
  
  
  1.5       +2 -2      apache-2.0/src/os/unix/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/unix/Makefile.tmpl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -d -u -r1.4 -r1.5
  --- Makefile.tmpl     1999/09/10 14:34:49     1.4
  +++ Makefile.tmpl     1999/09/23 19:08:19     1.5
  @@ -45,7 +45,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(INCDIR)/buff.h \
    $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
    $(INCDIR)/util_uri.h iol_socket.h
   os-aix-dso.o: os-aix-dso.c
  @@ -61,7 +61,7 @@
    ../../lib/apr/include/apr_general.h \
    ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
    ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
  - ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
  + $(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)/http_main.h \
  
  
  

Reply via email to