httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server Makefile.in
Date Sat, 30 Nov 2002 17:49:37 GMT
wrowe       2002/11/30 09:49:37

  Modified:    .        Tag: APACHE_2_0_BRANCH Makefile.win NWGNUmakefile
                        libhttpd.dsp
               server   Tag: APACHE_2_0_BRANCH Makefile.in
  Log:
    Back out provider.c from aaa 2.1 overhaul, for the time being.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.120.2.1 +12 -33    httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.120
  retrieving revision 1.120.2.1
  diff -u -r1.120 -r1.120.2.1
  --- Makefile.win	22 Nov 2002 01:05:22 -0000	1.120
  +++ Makefile.win	30 Nov 2002 17:49:36 -0000	1.120.2.1
  @@ -198,17 +198,11 @@
   	 $(MAKE) $(MAKEOPT) -f libhttpd.mak        CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f Apache.mak          CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	cd modules\aaa
  -	 $(MAKE) $(MAKEOPT) -f mod_auth_basic.mak  CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f mod_access.mak      CFG="mod_access - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f mod_auth.mak        CFG="mod_auth - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f mod_auth_anon.mak   CFG="mod_auth_anon - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f mod_auth_dbm.mak    CFG="mod_auth_dbm - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authn_anon.mak  CFG="mod_authn_anon - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak   CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authn_default.mak CFG="mod_authn_default - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authn_file.mak  CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authz_dbm.mak   CFG="mod_authz_dbm - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authz_default.mak CFG="mod_authz_default - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authz_groupfile.mak CFG="mod_authz_groupfile - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authz_host.mak  CFG="mod_authz_host - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_authz_user.mak  CFG="mod_authz_user - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	cd ..\..
   	cd modules\arch\win32
   	 $(MAKE) $(MAKEOPT) -f mod_isapi.mak       CFG="mod_isapi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  @@ -247,7 +241,6 @@
   	cd ..\..
   	cd modules\loggers
   	 $(MAKE) $(MAKEOPT) -f mod_log_config.mak  CFG="mod_log_config - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_logio.mak       CFG="mod_logio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	cd ..\..
   	cd modules\mappers
   	 $(MAKE) $(MAKEOPT) -f mod_actions.mak     CFG="mod_actions - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  @@ -366,17 +359,11 @@
   	copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y
   	copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y
   	copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y
  -	copy modules\aaa\$(LONG)\mod_auth_basic.so "$(INSTDIR)\modules" <.y
  +	copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y
  +	copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y
  +	copy modules\aaa\$(LONG)\mod_auth_anon.so "$(INSTDIR)\modules" <.y
  +	copy modules\aaa\$(LONG)\mod_auth_dbm.so "$(INSTDIR)\modules" <.y
   	copy modules\aaa\$(LONG)\mod_auth_digest.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authn_anon.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authn_dbm.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authn_default.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authn_file.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_dbm.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_default.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_groupfile.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_host.so "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_user.so "$(INSTDIR)\modules" <.y
   	copy modules\arch\win32\$(LONG)\mod_isapi.so "$(INSTDIR)\modules" <.y
   	copy modules\cache\$(LONG)\mod_file_cache.so "$(INSTDIR)\modules" <.y
   	copy modules\dav\fs\$(LONG)\mod_dav_fs.so "$(INSTDIR)\modules" <.y
  @@ -394,7 +381,6 @@
   	copy modules\generators\$(LONG)\mod_status.so "$(INSTDIR)\modules" <.y
   	copy modules\http\$(LONG)\mod_mime.so "$(INSTDIR)\modules" <.y
   	copy modules\loggers\$(LONG)\mod_log_config.so "$(INSTDIR)\modules" <.y
  -	copy modules\loggers\$(LONG)\mod_logio.so "$(INSTDIR)\modules" <.y
   	copy modules\mappers\$(LONG)\mod_actions.so "$(INSTDIR)\modules" <.y
   	copy modules\mappers\$(LONG)\mod_alias.so "$(INSTDIR)\modules" <.y
   	copy modules\mappers\$(LONG)\mod_dir.so "$(INSTDIR)\modules" <.y
  @@ -422,17 +408,11 @@
   	copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y
   	copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y
   	copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y
  -	copy modules\aaa\$(LONG)\mod_auth_basic.pdb "$(INSTDIR)\modules" <.y
  +	copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y
  +	copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y
  +	copy modules\aaa\$(LONG)\mod_auth_anon.pdb "$(INSTDIR)\modules" <.y
  +	copy modules\aaa\$(LONG)\mod_auth_dbm.pdb "$(INSTDIR)\modules" <.y
   	copy modules\aaa\$(LONG)\mod_auth_digest.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authn_anon.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authn_dbm.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authn_default.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authn_file.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_dbm.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_default.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_groupfile.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_host.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\aaa\$(LONG)\mod_authz_user.pdb "$(INSTDIR)\modules" <.y
   	copy modules\arch\win32\$(LONG)\mod_isapi.pdb "$(INSTDIR)\modules" <.y
   	copy modules\cache\$(LONG)\mod_file_cache.pdb "$(INSTDIR)\modules" <.y
   	copy modules\dav\fs\$(LONG)\mod_dav_fs.pdb "$(INSTDIR)\modules" <.y
  @@ -450,7 +430,6 @@
   	copy modules\generators\$(LONG)\mod_status.pdb "$(INSTDIR)\modules" <.y
   	copy modules\http\$(LONG)\mod_mime.pdb "$(INSTDIR)\modules" <.y
   	copy modules\loggers\$(LONG)\mod_log_config.pdb "$(INSTDIR)\modules" <.y
  -	copy modules\loggers\$(LONG)\mod_logio.pdb "$(INSTDIR)\modules" <.y
   	copy modules\mappers\$(LONG)\mod_actions.pdb "$(INSTDIR)\modules" <.y
   	copy modules\mappers\$(LONG)\mod_alias.pdb "$(INSTDIR)\modules" <.y
   	copy modules\mappers\$(LONG)\mod_dir.pdb "$(INSTDIR)\modules" <.y
  
  
  
  1.13.2.1  +3 -3      httpd-2.0/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/NWGNUmakefile,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- NWGNUmakefile	16 Oct 2002 23:52:35 -0000	1.13
  +++ NWGNUmakefile	30 Nov 2002 17:49:36 -0000	1.13.2.1
  @@ -119,7 +119,7 @@
   # This is used by the link '-desc ' directive. 
   # If left blank, NLM_NAME will be used.
   #
  -NLM_DESCRIPTION	= Apache Web Server $(VERSION_STR)
  +NLM_DESCRIPTION	= Apache Web Server 
   
   #
   # This is used by the '-threadname' directive.  If left blank,
  @@ -194,10 +194,11 @@
   	$(OBJDIR)/listen.o \
   	$(OBJDIR)/log.o \
   	$(OBJDIR)/main.o \
  -	$(OBJDIR)/mod_authz_host.o \
  +	$(OBJDIR)/mod_access.o \
   	$(OBJDIR)/mod_actions.o \
   	$(OBJDIR)/mod_alias.o \
   	$(OBJDIR)/mod_asis.o \
  +	$(OBJDIR)/mod_auth.o \
   	$(OBJDIR)/mod_autoindex.o \
   	$(OBJDIR)/mod_cgi.o \
   	$(OBJDIR)/mod_dir.o \
  @@ -218,7 +219,6 @@
   	$(OBJDIR)/pcre.o \
   	$(OBJDIR)/pcreposix.o \
   	$(OBJDIR)/protocol.o \
  -	$(OBJDIR)/provider.o \
   	$(OBJDIR)/request.o \
   	$(OBJDIR)/rfc1413.o \
   	$(OBJDIR)/scoreboard.o \
  
  
  
  1.51.2.1  +0 -4      httpd-2.0/libhttpd.dsp
  
  Index: libhttpd.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/libhttpd.dsp,v
  retrieving revision 1.51
  retrieving revision 1.51.2.1
  diff -u -r1.51 -r1.51.2.1
  --- libhttpd.dsp	20 Sep 2002 06:06:41 -0000	1.51
  +++ libhttpd.dsp	30 Nov 2002 17:49:36 -0000	1.51.2.1
  @@ -583,10 +583,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\server\provider.c
  -# End Source File
  -# Begin Source File
  -
   SOURCE=.\server\scoreboard.c
   # End Source File
   # Begin Source File
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.75.2.3  +1 -1      httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.75.2.2
  retrieving revision 1.75.2.3
  diff -u -r1.75.2.2 -r1.75.2.3
  --- Makefile.in	29 Nov 2002 20:10:38 -0000	1.75.2.2
  +++ Makefile.in	30 Nov 2002 17:49:37 -0000	1.75.2.3
  @@ -14,7 +14,7 @@
   	rfc1413.c connection.c listen.c \
   	mpm_common.c util_charset.c util_debug.c util_xml.c \
   	util_filter.c $(top_builddir)/server/exports.c buildmark.c \
  -	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c
  +	scoreboard.c error_bucket.c protocol.c core.c request.c
   
   TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
   
  
  
  

Mime
View raw message