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 Makefile.win Apache.dsw
Date Fri, 28 Sep 2001 16:02:50 GMT
wrowe       01/09/28 09:02:50

  Modified:    .        Makefile.win Apache.dsw
  Log:
    Reintegrate proxy into the core build
  
  Revision  Changes    Path
  1.75      +15 -5     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- Makefile.win	2001/09/17 01:28:39	1.74
  +++ Makefile.win	2001/09/28 16:02:50	1.75
  @@ -159,9 +159,12 @@
   	 $(MAKE) $(MAKEOPT) -f mod_headers.mak CFG="mod_headers - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_usertrack.mak CFG="mod_usertrack - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	cd ..\..
  -#	cd modules\proxy
  -#        $(MAKE) $(MAKEOPT) -f mod_proxy.mak CFG="mod_proxy - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -#       cd ..\..
  +	cd modules\proxy
  +	 $(MAKE) $(MAKEOPT) -f mod_proxy.mak CFG="mod_proxy - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f proxy_connect.mak CFG="proxy_connect - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f proxy_ftp.mak CFG="proxy_ftp - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f proxy_http.mak CFG="proxy_http - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	cd ..\..
   !IF EXIST("srclib\openssl")
   	cd modules\ssl
           $(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  @@ -220,6 +223,10 @@
   		"mod_expires - Win32 $(LONG)"\
   		"mod_headers - Win32 $(LONG)"\
   		"mod_usertrack - Win32 $(LONG)"\
  +		"mod_proxy - Win32 $(LONG)"\
  +		"proxy_connect - Win32 $(LONG)"\
  +		"proxy_ftp - Win32 $(LONG)"\
  +		"proxy_http - Win32 $(LONG)"\
   		"ab - Win32 $(LONG)"\
           	"htpasswd - Win32 $(LONG)"\
           	"htdigest - Win32 $(LONG)"\
  @@ -248,7 +255,7 @@
   	-mkdir "$(INSTDIR)\lib"
   	-mkdir "$(INSTDIR)\logs"
   	-mkdir "$(INSTDIR)\modules"
  -#	-mkdir "$(INSTDIR)\proxy"
  +	-mkdir "$(INSTDIR)\proxy"
   	copy ABOUT_APACHE "$(INSTDIR)\ABOUT_APACHE.txt"
   	copy CHANGES "$(INSTDIR)\CHANGES.txt"
   	copy INSTALL "$(INSTDIR)\INSTALL.txt"
  @@ -284,7 +291,10 @@
   	copy modules\metadata\$(LONG)\mod_expires.so "$(INSTDIR)\modules"
   	copy modules\metadata\$(LONG)\mod_headers.so "$(INSTDIR)\modules"
   	copy modules\metadata\$(LONG)\mod_usertrack.so "$(INSTDIR)\modules"
  -#       copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"
  +	copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"
  +	copy modules\proxy\$(LONG)\proxy_connect.so "$(INSTDIR)\modules"
  +	copy modules\proxy\$(LONG)\proxy_ftp.so "$(INSTDIR)\modules"
  +	copy modules\proxy\$(LONG)\proxy_http.so "$(INSTDIR)\modules"
   !IF EXIST("srclib\openssl")
   	-copy modules\ssl\$(LONG)\mod_ssl.so "$(INSTDIR)\modules"
   	-copy srclib\openssl\$(SSLBIN)\openssl.exe "$(INSTDIR)\bin"
  
  
  
  1.61      +105 -0    httpd-2.0/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- Apache.dsw	2001/09/13 15:22:31	1.60
  +++ Apache.dsw	2001/09/28 16:02:50	1.61
  @@ -90,6 +90,18 @@
       Project_Dep_Name mod_usertrack
       End Project Dependency
       Begin Project Dependency
  +    Project_Dep_Name mod_proxy
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name proxy_connect
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name proxy_ftp
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name proxy_http
  +    End Project Dependency
  +    Begin Project Dependency
       Project_Dep_Name ab
       End Project Dependency
       Begin Project Dependency
  @@ -619,6 +631,99 @@
       End Project Dependency
       Begin Project Dependency
       Project_Dep_Name libhttpd
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
  +Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name libapr
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libaprutil
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libhttpd
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
  +Project: "proxy_connect"=".\modules\proxy\proxy_connect.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name libapr
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libaprutil
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libhttpd
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name mod_proxy
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
  +Project: "proxy_ftp"=".\modules\proxy\proxy_ftp.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name libapr
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libaprutil
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libhttpd
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name mod_proxy
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
  +Project: "proxy_http"=".\modules\proxy\proxy_http.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name libapr
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libaprutil
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libhttpd
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name mod_proxy
       End Project Dependency
   }}}
   
  
  
  

Mime
View raw message