cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl

1999-07-06 Thread ben
ben 99/07/06 14:32:31

  Modified:mpm/src  Makefile.tmpl
   mpm/src/include ap_hooks.h http_config.h http_protocol.h
   mpm/src/main Makefile.tmpl alloc.c http_config.c
http_connection.c http_core.c http_protocol.c
http_request.c rfc1413.c
   mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
   mpm/src/modules/standard Makefile.tmpl mod_access.c
mod_alias.c mod_asis.c mod_auth.c mod_autoindex.c
mod_dir.c mod_env.c mod_imap.c mod_log_config.c
mod_mime.c mod_negotiation.c mod_setenvif.c
mod_userdir.c
   mpm/src/os/unix Makefile.tmpl
  Log:
  More hooky stuff.
  
  Revision  ChangesPath
  1.5   +1 -1  apache-2.0/mpm/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.tmpl 1999/06/29 09:00:04 1.4
  +++ Makefile.tmpl 1999/07/06 21:32:07 1.5
  @@ -129,4 +129,4 @@
include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \
os/unix/os-inline.c include/ap_ctype.h include/alloc.h include/buff.h \
include/ap_iol.h include/ap.h include/apr.h include/util_uri.h \
  - include/http_config.h
  + include/http_config.h include/ap_hooks.h
  
  
  
  1.2   +15 -9 apache-2.0/mpm/src/include/ap_hooks.h
  
  Index: ap_hooks.h
  ===
  RCS file: /export/home/cvs/apache-2.0/mpm/src/include/ap_hooks.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_hooks.h1999/07/05 13:00:42 1.1
  +++ ap_hooks.h1999/07/06 21:32:08 1.2
  @@ -1,6 +1,10 @@
  +#ifndef APACHE_AP_HOOKS_H
  +#define APACHE_AP_HOOKS_H
  +
   #define DECLARE_HOOK(ret,name,args) \
   typedef ret HOOK_##name args; \
  -void hook_##name(HOOK_##name *pf); \
  +void ap_hook_##name(HOOK_##name *pf); \
  +ret ap_run_##name args; \
   typedef struct _LINK_##name \
   { \
   HOOK_##name *pFunc; \
  @@ -13,15 +17,15 @@
   #define HOOK_LINK(name) \
   LINK_##name *link_##name;
   
  -#define 
IMPLEMENT_HOOK_BASE(ret,rv_decl,sv,rv,name,args,args2,run_all,terminate) \
  -void hook_##name(HOOK_##name *pf) \
  +#define 
IMPLEMENT_HOOK_BASE(ret,rv_decl,sv,rv,name,args,args2,run_all,term1,term2,rv_final)
 \
  +void ap_hook_##name(HOOK_##name *pf) \
   { \
   LINK_##name *pHook=ap_palloc(g_pHookPool,sizeof(LINK_##name)); \
   pHook-pNext=_hooks.link_##name; \
   pHook-pFunc=pf; \
   _hooks.link_##name=pHook; \
   } \
  -ret run_##name args \
  +ret ap_run_##name args \
   { \
   LINK_##name *pHook; \
   rv_decl \
  @@ -30,15 +34,17 @@
{ \
sv pHook-pFunc args2; \
   \
  - if(!run_all terminate) \
  + if(term1  (!run_all || term2)) \
return rv; \
} \
  -return rv; \
  +return rv_final; \
   }
   
  -#define IMPLEMENT_HOOK(ret,name,args,args2,run_all,finish) \
  - IMPLEMENT_HOOK_BASE(ret,ret r;,r=,r,name,args,args2,run_all, r == 
finish)
  +#define IMPLEMENT_HOOK(ret,name,args,args2,run_all,ok,decline) \
  + IMPLEMENT_HOOK_BASE(ret,ret r_;,r_=,r_,name,args,args2,run_all,r_ != 
decline,r_ != ok,run_all ? ok : decline)
   #define IMPLEMENT_VOID_HOOK(name,args,args2,run_all) \
  - IMPLEMENT_HOOK_BASE(voidname,args,args2,run_all,)
  + IMPLEMENT_HOOK_BASE(voidname,args,args2,run_all,1,0,)
   
   extern pool *g_pHookPool;
  +
  +#endif /* ndef(AP_HOOKS_H) */
  
  
  
  1.5   +5 -6  apache-2.0/mpm/src/include/http_config.h
  
  Index: http_config.h
  ===
  RCS file: /export/home/cvs/apache-2.0/mpm/src/include/http_config.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- http_config.h 1999/07/05 13:00:42 1.4
  +++ http_config.h 1999/07/06 21:32:08 1.5
  @@ -58,6 +58,8 @@
   #ifndef APACHE_HTTP_CONFIG_H
   #define APACHE_HTTP_CONFIG_H
   
  +#include ap_hooks.h
  +
   #ifdef __cplusplus
   extern C {
   #endif
  @@ -236,8 +238,6 @@
* type_checker --- Determine MIME type of the requested entity;
*  sets content_type, _encoding and _language fields.
* logger --- log a transaction.
  - * post_read_request --- run right after read_request or 
internal_redirect,
  - *  and not run during any subrequests.
*/
   
   int (*translate_handler) (request_rec *);
  @@ -247,8 +247,6 @@
   int (*type_checker) (request_rec *);
   int (*fixer_upper) (request_rec *);
   int (*logger) (request_rec *);
  -int (*header_parser) (request_rec *);
  -int (*post_read_request) (request_rec *);
  

cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl

1999-06-29 Thread ben
ben 99/06/29 02:00:32

  Modified:mpm/src  Makefile.tmpl
   mpm/src/ap Makefile.tmpl
   mpm/src/include http_config.h http_connection.h httpd.h
   mpm/src/main Makefile.tmpl http_config.c http_connection.c
   mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
   mpm/src/modules/standard Makefile.tmpl
   mpm/src/os/unix Makefile.tmpl
  Log:
  New API for I/O layering, and dependency updates.
  
  Revision  ChangesPath
  1.4   +5 -6  apache-2.0/mpm/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl 1999/06/20 23:14:29 1.3
  +++ Makefile.tmpl 1999/06/29 09:00:04 1.4
  @@ -123,11 +123,10 @@
   # DO NOT REMOVE
   buildmark.o: buildmark.c 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 include/hsregex.h include/httpd.h include/alloc.h \
  - include/buff.h include/ap_iol.h include/ap.h include/apr.h \
  - include/util_uri.h
  + include/ap_ctype.h include/httpd.h include/alloc.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 include/hsregex.h \
  - include/alloc.h include/buff.h include/ap_iol.h include/ap.h \
  - include/apr.h include/util_uri.h include/http_config.h
  + os/unix/os-inline.c include/ap_ctype.h include/alloc.h include/buff.h \
  + include/ap_iol.h include/ap.h include/apr.h include/util_uri.h \
  + include/http_config.h
  
  
  
  1.5   +20 -22apache-2.0/mpm/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.tmpl 1999/06/20 23:14:30 1.4
  +++ Makefile.tmpl 1999/06/29 09:00:06 1.5
  @@ -41,41 +41,39 @@
   # DO NOT REMOVE
   ap_buf.o: ap_buf.c $(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)/ap_buf.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/ap_buf.h
   ap_cpystrn.o: ap_cpystrn.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.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
   ap_execve.o: ap_execve.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.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
   ap_fnmatch.o: ap_fnmatch.c $(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)/fnmatch.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/fnmatch.h
   ap_getpass.o: ap_getpass.c $(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)/ap.h \
  - $(INCDIR)/apr.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/ap.h $(INCDIR)/apr.h
   ap_md5c.o: ap_md5c.c $(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)/ap_md5.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/ap_md5.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h
   ap_signal.o: ap_signal.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.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
   ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - 

cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl

1999-06-24 Thread dgaudet
dgaudet 99/06/24 01:59:00

  Modified:mpm/src/main Makefile.tmpl
   mpm/src/modules/mpm/prefork Makefile.tmpl
   mpm/src/os/unix Makefile.tmpl
  Log:
  depends
  
  Revision  ChangesPath
  1.7   +1 -1  apache-2.0/mpm/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.tmpl 1999/06/24 08:58:00 1.6
  +++ Makefile.tmpl 1999/06/24 08:58:56 1.7
  @@ -143,7 +143,7 @@
$(INCDIR)/http_config.h $(INCDIR)/http_log.h \
$(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h \
$(INCDIR)/http_core.h
  -iol_unix.o: iol_unix.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
  +iol_file.o: iol_file.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)/hsregex.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  
  
  
  1.2   +10 -7 apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/06/24 01:57:58 1.1
  +++ Makefile.tmpl 1999/06/24 08:58:58 1.2
  @@ -55,12 +55,15 @@
   $(OBJS) $(OBJS_PIC): Makefile
   
   # DO NOT REMOVE
  -prefork.o: 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)/hsregex.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 \
  +prefork.o: 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)/hsregex.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)/http_core.h $(INCDIR)/http_connection.h \
$(INCDIR)/scoreboard_prefork.h $(INCDIR)/ap_mpm.h \
  - $(OSDIR)/unixd.h
  + $(OSDIR)/unixd.h $(OSDIR)/iol_socket.h
  
  
  
  1.6   +7 -0  apache-2.0/mpm/src/os/unix/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/os/unix/Makefile.tmpl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.tmpl 1999/06/24 08:58:04 1.5
  +++ Makefile.tmpl 1999/06/24 08:58:59 1.6
  @@ -38,6 +38,13 @@
   $(OBJS): Makefile
   
   # DO NOT REMOVE
  +iol_socket.o: iol_socket.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)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  + $(INCDIR)/util_uri.h
   os-aix-dso.o: os-aix-dso.c
   os-inline.o: os-inline.c $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
  
  
  


cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl

1999-06-21 Thread dgaudet
dgaudet 99/06/20 16:14:36

  Modified:mpm/src  Makefile.tmpl
   mpm/src/ap Makefile.tmpl
   mpm/src/main Makefile.tmpl
   mpm/src/modules/standard Makefile.tmpl
   mpm/src/os/unix Makefile.tmpl
  Log:
  depends
  
  Revision  ChangesPath
  1.3   +4 -3  apache-2.0/mpm/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl 1999/06/18 19:07:59 1.2
  +++ Makefile.tmpl 1999/06/20 23:14:29 1.3
  @@ -124,9 +124,10 @@
   buildmark.o: buildmark.c 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 include/hsregex.h include/httpd.h include/alloc.h \
  - include/buff.h include/ap.h include/apr.h include/util_uri.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 include/hsregex.h \
  - include/alloc.h include/buff.h include/ap.h include/apr.h \
  - include/util_uri.h include/http_config.h
  + include/alloc.h include/buff.h include/ap_iol.h include/ap.h \
  + include/apr.h include/util_uri.h include/http_config.h
  
  
  
  1.4   +14 -10apache-2.0/mpm/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl 1999/06/19 20:41:59 1.3
  +++ Makefile.tmpl 1999/06/20 23:14:30 1.4
  @@ -39,16 +39,19 @@
 rm Makefile.new
   
   # DO NOT REMOVE
  +ap_buf.o: ap_buf.c $(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)/ap_buf.h
   ap_cpystrn.o: ap_cpystrn.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  + $(INCDIR)/alloc.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 \
$(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.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  + $(INCDIR)/alloc.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 \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
  @@ -63,15 +66,16 @@
   ap_signal.o: ap_signal.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  + $(INCDIR)/alloc.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 \
$(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.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
  + $(INCDIR)/alloc.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 \
$(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.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  
  
  
  1.4   +64 -48apache-2.0/mpm/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl 1999/06/18 23:34:59 1.3
  +++ Makefile.tmpl 1999/06/20 23:14:31 1.4
  @@ -61,40 +61,44 @@
   alloc.o: alloc.c $(INCDIR)/httpd.h 

cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl

1999-06-18 Thread dgaudet
dgaudet 99/06/18 12:08:08

  Modified:mpm/src/ap Makefile.tmpl
   mpm/src  Makefile.tmpl
   mpm/src/main Makefile.tmpl
   mpm/src/modules/standard Makefile.tmpl
   mpm/src/os/unix Makefile.tmpl
  Log:
  update dependencies
  
  Revision  ChangesPath
  1.2   +8 -7  apache-2.0/mpm/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/06/18 18:39:23 1.1
  +++ Makefile.tmpl 1999/06/18 19:07:57 1.2
  @@ -42,35 +42,36 @@
   ap_cpystrn.o: ap_cpystrn.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
$(INCDIR)/util_uri.h
   ap_execve.o: ap_execve.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.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 \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
   ap_getpass.o: ap_getpass.c $(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)/ap.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h
   ap_md5c.o: ap_md5c.c $(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)/ap_md5.h \
  - $(INCDIR)/ap.h
  + $(INCDIR)/ap.h $(INCDIR)/apr.h
   ap_signal.o: ap_signal.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
$(INCDIR)/util_uri.h
   ap_slack.o: ap_slack.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)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.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 \
$(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.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
$(INCDIR)/util_uri.h
  
  
  
  1.2   +6 -5  apache-2.0/mpm/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/06/18 18:39:23 1.1
  +++ Makefile.tmpl 1999/06/18 19:07:59 1.2
  @@ -122,10 +122,11 @@
   
   # DO NOT REMOVE
   buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \
  - include/ap_config_auto.h os/unix/os.h include/ap_ctype.h \
  - include/hsregex.h include/httpd.h include/alloc.h include/buff.h \
  - include/ap.h include/util_uri.h
  + include/ap_config_auto.h os/unix/os.h os/unix/os-inline.c \
  + include/ap_ctype.h include/hsregex.h include/httpd.h include/alloc.h \
  + include/buff.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 \
  - include/ap_ctype.h include/hsregex.h include/alloc.h include/buff.h \
  - include/ap.h include/util_uri.h include/http_config.h
  + os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \
  + include/alloc.h include/buff.h include/ap.h include/apr.h \
  + include/util_uri.h include/http_config.h
  
  
  
  1.2   +34 -63apache-2.0/mpm/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/06/18 18:39:29 1.1
  +++ Makefile.tmpl 1999/06/18 19:08:01 1.2