Fix various inconsistencies between the saved IDE structure and the

  current .dsp files.

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

diff --git a/modules/experimental/mod_disk_cache.dsp b/modules/experimental/mod_disk_cache.dsp
index cac9ac0e37d89f13a37a969dae149409fc42d6fb..8dd47681d66e252ea1c41db574d4ee63332cba28 100644 (file)
--- a/modules/experimental/mod_disk_cache.dsp
+++ b/modules/experimental/mod_disk_cache.dsp
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386
 # ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_disk_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_disk_cache
 
 !ELSEIF  "$(CFG)" == "mod_disk_cache - Win32 Debug"
@@ -78,8 +78,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /map /machine:I386
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /map /machine:I386 /out:"Debug/mod_disk_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_disk_cache
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_disk_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_disk_cache
 
 !ENDIF 
 
@@ -89,11 +89,11 @@ LINK32=link.exe
 # Name "mod_disk_cache - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\mod_disk_cache.c
+SOURCE=.\mod_cache.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\mod_cache.h
+SOURCE=.\mod_disk_cache.c
 # End Source File
 # Begin Source File
 

diff --git a/modules/experimental/mod_mem_cache.dsp b/modules/experimental/mod_mem_cache.dsp
index ac5b1cdcab65592881be7cf0985c4bf4c19fb1a0..de307d4482eda0bff8759f72208f088c925941d0 100644 (file)
--- a/modules/experimental/mod_mem_cache.dsp
+++ b/modules/experimental/mod_mem_cache.dsp
@@ -78,8 +78,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /debug /map /machine:I386
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /map /machine:I386 /out:"Debug/mod_mem_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_mem_cache
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_mem_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_mem_cache
 
 !ENDIF 
 
@@ -89,11 +89,11 @@ LINK32=link.exe
 # Name "mod_mem_cache - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\mod_mem_cache.c
+SOURCE=.\mod_cache.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\mod_cache.h
+SOURCE=.\mod_mem_cache.c
 # End Source File
 # Begin Source File
 

diff --git a/modules/filters/mod_deflate.dsp b/modules/filters/mod_deflate.dsp
index fb373901c2149ec8cce680e9577243e17d6d1f03..6019300e1585d547528f9845611a799715ee6423 100644 (file)
--- a/modules/filters/mod_deflate.dsp
+++ b/modules/filters/mod_deflate.dsp
@@ -11,7 +11,7 @@ CFG=mod_deflate - Win32 Release
 !MESSAGE NMAKE /f "mod_deflate.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For deflate:
+!MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE NMAKE /f "mod_deflate.mak" CFG="mod_deflate - Win32 Release"
 !MESSAGE 
@@ -87,43 +87,6 @@ LINK32=link.exe
 
 # Name "mod_deflate - Win32 Release"
 # Name "mod_deflate - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_deflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_deflate.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF  "$(CFG)" == "mod_deflate - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_deflate.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk mod_deflate.so "deflate_module for Apache" ../../include/ap_release.h > .\mod_deflate.rc
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "mod_deflate - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_deflate.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk mod_deflate.so "deflate_module for Apache" ../../include/ap_release.h > .\mod_deflate.rc
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
 # Begin Group "zlib"
 
 # PROP Default_Filter ""
@@ -172,5 +135,42 @@ SOURCE=..\..\srclib\zlib\trees.c
 SOURCE=..\..\srclib\zlib\zutil.c
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=.\mod_deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_deflate.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF  "$(CFG)" == "mod_deflate - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_deflate.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_deflate.so "deflate_module for Apache" ../../include/ap_release.h > .\mod_deflate.rc
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mod_deflate - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_deflate.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_deflate.so "deflate_module for Apache" ../../include/ap_release.h > .\mod_deflate.rc
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Target
 # End Project

diff --git a/modules/filters/mod_ext_filter.dsp b/modules/filters/mod_ext_filter.dsp
index 665d670b82f4a2b57087d05aefc97be5ca4b3ffe..1c7edf653dab7ac878ab97fb1b02ac1efb26b820 100644 (file)
--- a/modules/filters/mod_ext_filter.dsp
+++ b/modules/filters/mod_ext_filter.dsp
@@ -11,7 +11,7 @@ CFG=mod_ext_filter - Win32 Release
 !MESSAGE NMAKE /f "mod_ext_filter.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For ext_filter:
+!MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE NMAKE /f "mod_ext_filter.mak" CFG="mod_ext_filter - Win32 Release"
 !MESSAGE