Update for the 2.0.23 tag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89994 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 28 insertions, 62 deletions

diff --git a/modules/tls/mod_tls.mak b/modules/tls/mod_tls.mak
index 60da3a9880..d780737a6a 100644
--- a/modules/tls/mod_tls.mak
+++ b/modules/tls/mod_tls.mak
@@ -27,6 +27,10 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "mod_tls - Win32 Release"
 
 OUTDIR=.\Release
@@ -63,47 +67,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
 CPP_PROJ=/nologo /MD /W3 /O2 /I "../../include" /I "../../os/win32" /I\
  "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I\
  "../../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"\
  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_tls" /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_tls.bsc" 
 BSC32_SBRS= \
@@ -163,13 +133,36 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
 CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../os/win32" /I\
  "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I\
  "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_tls" /FD /c 
 CPP_OBJS=.\Debug/
 CPP_SBRS=.
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_tls.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\mod_tls.pdb" /map:"$(INTDIR)\mod_tls.map"\
+ /debug /machine:I386 /out:"$(OUTDIR)\mod_tls.so"\
+ /implib:"$(OUTDIR)\mod_tls.lib" /libpath:"../../srclib/openssl/out32dll.dbg"\
+ /base:@..\..\os\win32\BaseAddr.ref,mod_tls 
+LINK32_OBJS= \
+	"$(INTDIR)\mod_tls.obj" \
+	"$(INTDIR)\openssl_state_machine.obj" \
+	"..\..\Debug\libhttpd.lib" \
+	"..\..\srclib\apr-util\Debug\libaprutil.lib" \
+	"..\..\srclib\apr\Debug\libapr.lib"
+
+"$(OUTDIR)\mod_tls.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(CPP_OBJS)}.obj::
    $(CPP) @<<
@@ -201,33 +194,6 @@ CPP_SBRS=.
    $(CPP_PROJ) $< 
 <<
 
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_tls.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows\
- /dll /incremental:no /pdb:"$(OUTDIR)\mod_tls.pdb" /map:"$(INTDIR)\mod_tls.map"\
- /debug /machine:I386 /out:"$(OUTDIR)\mod_tls.so"\
- /implib:"$(OUTDIR)\mod_tls.lib" /libpath:"../../srclib/openssl/out32dll.dbg"\
- /base:@..\..\os\win32\BaseAddr.ref,mod_tls 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_tls.obj" \
-	"$(INTDIR)\openssl_state_machine.obj" \
-	"..\..\Debug\libhttpd.lib" \
-	"..\..\srclib\apr-util\Debug\libaprutil.lib" \
-	"..\..\srclib\apr\Debug\libapr.lib"
-
-"$(OUTDIR)\mod_tls.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(CFG)" == "mod_tls - Win32 Release" || "$(CFG)" ==\
  "mod_tls - Win32 Debug"