You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/10/11 16:26:01 UTC
cvs commit: apache-2.0/src/os/win32 mod_proxy.dsp
wrowe 00/10/11 07:26:01
Modified: src Apache.dsw Makefile.win
src/os/win32 mod_proxy.dsp
Log:
Finish the ApacheModuleBleck -> mod_bleck cleanup
Revision Changes Path
1.24 +1 -1 apache-2.0/src/Apache.dsw
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/apache-2.0/src/Apache.dsw,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Apache.dsw 2000/10/11 14:04:39 1.23
+++ Apache.dsw 2000/10/11 14:26:00 1.24
@@ -216,7 +216,7 @@
###############################################################################
-Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>
+Project: "mod_proxy"=".\os\win32\mod_proxy.dsp" - Package Owner=<4>
Package=<5>
{{{
1.27 +5 -7 apache-2.0/src/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.win,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.win 2000/10/11 14:04:39 1.26
+++ Makefile.win 2000/10/11 14:26:00 1.27
@@ -102,10 +102,8 @@
$(MAKE) $(MAKEOPT) -f mod_status.mak CFG="mod_status - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_usertrack.mak CFG="mod_usertrack - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_rewrite.mak CFG="mod_rewrite - 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 ..\..
cd support
$(MAKE) $(MAKEOPT) -f ab.mak CFG="ab - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f htpasswd.mak CFG="htpasswd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -125,19 +123,19 @@
copy lib\apr\$(LONG)\aprlib.dll $(INSTDIR)
copy lib\expat-lite\XMLParse$(SHORT)\xmlparse.dll $(INSTDIR)
copy lib\expat-lite\XMLTok$(SHORT)\xmltok.dll $(INSTDIR)
- copy os\win32\mod_status$(SHORT)\mod_status.dll $(INSTDIR)\modules
-# copy os\win32\mod_info$(SHORT)\mod_info.dll $(INSTDIR)\modules
copy os\win32\mod_auth_anon$(SHORT)\mod_auth_anon.dll $(INSTDIR)\modules
+ copy os\win32\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules
copy os\win32\mod_auth_digest$(SHORT)\mod_auth_digest.dll $(INSTDIR)\modules
copy os\win32\mod_cern_meta$(SHORT)\mod_cern_meta.dll $(INSTDIR)\modules
copy os\win32\mod_expires$(SHORT)\mod_expires.dll $(INSTDIR)\modules
copy os\win32\mod_file_cache$(SHORT)\mod_file_cache.dll $(INSTDIR)\modules
copy os\win32\mod_headers$(SHORT)\mod_headers.dll $(INSTDIR)\modules
+# copy os\win32\mod_info$(SHORT)\mod_info.dll $(INSTDIR)\modules
copy os\win32\mod_rewrite$(SHORT)\mod_rewrite.dll $(INSTDIR)\modules
copy os\win32\mod_speling$(SHORT)\mod_speling.dll $(INSTDIR)\modules
+ copy os\win32\mod_status$(SHORT)\mod_status.dll $(INSTDIR)\modules
copy os\win32\mod_user_track$(SHORT)\mod_user_track.dll $(INSTDIR)\modules
- copy os\win32\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules
-# copy modules\proxy\$(LONG)\mod_proxy.dll $(INSTDIR)\modules
+# copy os\win32\mod_proxy$(SHORT)\mod_proxy.dll $(INSTDIR)\modules
copy support\$(LONG)\ab.exe $(INSTDIR)\bin
copy support\$(LONG)\htpasswd.exe $(INSTDIR)\bin
copy support\$(LONG)\htdigest.exe $(INSTDIR)\bin
1.10 +26 -26 apache-2.0/src/os/win32/mod_proxy.dsp
Index: mod_proxy.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/mod_proxy.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_proxy.dsp 2000/08/18 04:50:22 1.9
+++ mod_proxy.dsp 2000/10/11 14:26:00 1.10
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleProxy" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_proxy" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=ApacheModuleProxy - Win32 Release
+CFG=mod_proxy - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "ApacheModuleProxy.mak".
+!MESSAGE NMAKE /f "mod_proxy.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "ApacheModuleProxy.mak" CFG="ApacheModuleProxy - Win32 Release"
+!MESSAGE NMAKE /f "mod_proxy.mak" CFG="mod_proxy - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "ApacheModuleProxy - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleProxy - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -29,21 +29,21 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
+!IF "$(CFG)" == "mod_proxy - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\ApacheMo"
-# PROP BASE Intermediate_Dir ".\ApacheMo"
+# PROP BASE Output_Dir ".\mod_proxyR"
+# PROP BASE Intermediate_Dir ".\mod_proxyR"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release"
-# PROP Intermediate_Dir ".\Release"
+# PROP Output_Dir ".\mod_proxyR"
+# PROP Intermediate_Dir ".\mod_proxyR"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\modules\proxy" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -55,21 +55,21 @@
# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_proxy
# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_proxy
-!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
+!ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\ApacheM0"
-# PROP BASE Intermediate_Dir ".\ApacheM0"
+# PROP BASE Output_Dir ".\mod_proxyD"
+# PROP BASE Intermediate_Dir ".\mod_proxyD"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug"
-# PROP Intermediate_Dir ".\Debug"
+# PROP Output_Dir ".\mod_proxyD"
+# PROP Intermediate_Dir ".\mod_proxyD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\modules\proxy" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -86,30 +86,30 @@
# Begin Target
-# Name "ApacheModuleProxy - Win32 Release"
-# Name "ApacheModuleProxy - Win32 Debug"
+# Name "mod_proxy - Win32 Release"
+# Name "mod_proxy - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=.\mod_proxy.c
+SOURCE=..\..\modules\proxy\mod_proxy.c
# End Source File
# Begin Source File
-SOURCE=.\proxy_connect.c
+SOURCE=..\..\modules\proxy\proxy_connect.c
# End Source File
# Begin Source File
-SOURCE=.\proxy_ftp.c
+SOURCE=..\..\modules\proxy\proxy_ftp.c
# End Source File
# Begin Source File
-SOURCE=.\proxy_http.c
+SOURCE=..\..\modules\proxy\proxy_http.c
# End Source File
# Begin Source File
-SOURCE=.\proxy_util.c
+SOURCE=..\..\modules\proxy\proxy_util.c
# End Source File
# End Group
# Begin Group "Header Files"
@@ -117,7 +117,7 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
# Begin Source File
-SOURCE=.\mod_proxy.h
+SOURCE=..\..\modules\proxy\mod_proxy.h
# End Source File
# End Group
# End Target