From 446a7805af468df9a8622e676e7ff9b90292e93d Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Wed, 11 Oct 2000 14:26:00 +0000 Subject: [PATCH] Finish the ApacheModuleBleck -> mod_bleck cleanup git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86537 13f79535-47bb-0310-9956-ffa450edef68 --- Apache.dsw | 2 +- Makefile.win | 12 ++++----- modules/proxy/mod_proxy.dsp | 52 ++++++++++++++++++------------------- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/Apache.dsw b/Apache.dsw index f9e4a8add6..866d1ec783 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -216,7 +216,7 @@ Package=<4> ############################################################################### -Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4> +Project: "mod_proxy"=".\os\win32\mod_proxy.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/Makefile.win b/Makefile.win index 92a64a6a46..eb4dbd2343 100644 --- a/Makefile.win +++ b/Makefile.win @@ -102,10 +102,8 @@ _build: $(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 @@ _install: 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 diff --git a/modules/proxy/mod_proxy.dsp b/modules/proxy/mod_proxy.dsp index 93f313b9d1..2fee9d1c4a 100644 --- a/modules/proxy/mod_proxy.dsp +++ b/modules/proxy/mod_proxy.dsp @@ -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 @@ CPP=cl.exe 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 @@ LINK32=link.exe # 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 @@ LINK32=link.exe # 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 @@ SOURCE=.\proxy_util.c # 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 -- 2.50.1