httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/os/win32 mod_proxy.mak
Date Thu, 08 Feb 2001 22:27:51 GMT
wrowe       01/02/08 14:27:50

  Modified:    src/os/win32 mod_proxy.mak
  Log:
    Relocate .h files within the mod_proxy (didn't take well to being moved.)
  
  Revision  Changes    Path
  1.2       +71 -44    apache-1.3/src/os/win32/mod_proxy.mak
  
  Index: mod_proxy.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_proxy.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_proxy.mak	2000/12/21 07:24:34	1.1
  +++ mod_proxy.mak	2001/02/08 22:27:45	1.2
  @@ -28,10 +28,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -MTL=midl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "mod_proxy - Win32 Release"
   
   OUTDIR=.\Release
  @@ -70,12 +66,46 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\modules\proxy" /D\
  - "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c 
  +CPP=cl.exe
  +CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\
  + "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +MTL=midl.exe
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  +RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
   BSC32_SBRS= \
  @@ -138,37 +168,13 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I\
  +CPP=cl.exe
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
    /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
  -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
  - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\
  - /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\
  - /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy 
  -LINK32_OBJS= \
  -	"$(INTDIR)\mod_proxy.obj" \
  -	"$(INTDIR)\proxy_cache.obj" \
  -	"$(INTDIR)\proxy_connect.obj" \
  -	"$(INTDIR)\proxy_ftp.obj" \
  -	"$(INTDIR)\proxy_http.obj" \
  -	"$(INTDIR)\proxy_util.obj" \
  -	"..\..\Debug\ApacheCore.lib"
   
  -"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -199,6 +205,34 @@
      $(CPP_PROJ) $< 
   <<
   
  +MTL=midl.exe
  +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  +RSC=rc.exe
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
  + /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\
  + /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\
  + /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy 
  +LINK32_OBJS= \
  +	"$(INTDIR)\mod_proxy.obj" \
  +	"$(INTDIR)\proxy_cache.obj" \
  +	"$(INTDIR)\proxy_connect.obj" \
  +	"$(INTDIR)\proxy_ftp.obj" \
  +	"$(INTDIR)\proxy_http.obj" \
  +	"$(INTDIR)\proxy_util.obj" \
  +	"..\..\Debug\ApacheCore.lib"
  +
  +"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   
   !IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" ==\
    "mod_proxy - Win32 Debug"
  @@ -226,7 +260,6 @@
   NODEP_CPP_MOD_P=\
   	"..\..\include\ap_config_auto.h"\
   	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -261,9 +294,7 @@
   NODEP_CPP_PROXY=\
   	"..\..\include\ap_config_auto.h"\
   	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
   	"..\..\include\sfio.h"\
  -	"..\..\modules\proxy\os.h"\
   	
   
   "$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
  @@ -293,7 +324,6 @@
   NODEP_CPP_PROXY_=\
   	"..\..\include\ap_config_auto.h"\
   	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -325,7 +355,6 @@
   NODEP_CPP_PROXY_F=\
   	"..\..\include\ap_config_auto.h"\
   	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -358,7 +387,6 @@
   NODEP_CPP_PROXY_H=\
   	"..\..\include\ap_config_auto.h"\
   	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -392,7 +420,6 @@
   NODEP_CPP_PROXY_U=\
   	"..\..\include\ap_config_auto.h"\
   	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
   	"..\..\include\sfio.h"\
   	
   
  @@ -403,13 +430,13 @@
   !IF  "$(CFG)" == "mod_proxy - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\test\apache-1.3\src"
  +   cd "\clean\apache-1.3\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\test\apache-1.3\src"
  +   cd "\clean\apache-1.3\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -417,12 +444,12 @@
   !ELSEIF  "$(CFG)" == "mod_proxy - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\test\apache-1.3\src"
  +   cd "\clean\apache-1.3\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\test\apache-1.3\src"
  +   cd "\clean\apache-1.3\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  
  
  

Mime
View raw message