Reorganize a bit for legibility.

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

1 files changed, 134 insertions, 154 deletions

diff --git a/libhttpd.dsp b/libhttpd.dsp
index 3630df78e1..98daabc097 100644
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -97,20 +97,20 @@ PreLink_Cmds=cl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr
 
 # Name "libhttpd - Win32 Release"
 # Name "libhttpd - Win32 Debug"
-# Begin Group "core"
+# Begin Group "headers"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
 
-SOURCE=.\include\ap_config.h
+SOURCE=.\include\ap_compat.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ap_mmn.h
+SOURCE=.\include\ap_config.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ap_regkey.h
+SOURCE=.\include\ap_mmn.h
 # End Source File
 # Begin Source File
 
@@ -118,23 +118,6 @@ SOURCE=.\include\ap_release.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\buildmark.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\config.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\connection.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\core.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\http_config.h
 # End Source File
 # Begin Source File
@@ -171,73 +154,6 @@ SOURCE=.\include\httpd.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\log.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\os\win32\modules.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\os\win32\os.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\protocol.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\request.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\scoreboard.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\scoreboard.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\vhost.c
-# End Source File
-# End Group
-# Begin Group "generated"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\server\gen_test_char.exe
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__GEN_T=".\include\os.h"	
-# Begin Custom Build - Generating test_char.h from gen_test_char.exe
-InputPath=.\server\gen_test_char.exe
-
-".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	.\server\gen_test_char.exe >.\server\test_char.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__GEN_T=".\include\os.h"	
-# Begin Custom Build - Generating test_char.h from gen_test_char.exe
-InputPath=.\server\gen_test_char.exe
-
-".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	.\server\gen_test_char.exe >.\server\test_char.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\modules\generators\mod_cgi.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
@@ -383,64 +299,6 @@ InputPath=.\modules\proxy\mod_proxy.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\mpm\winnt\mpm.h
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm.h
-InputPath=.\server\mpm\winnt\mpm.h
-
-".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\server\mpm\winnt\mpm.h > .\include\mpm.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm.h
-InputPath=.\server\mpm\winnt\mpm.h
-
-".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\server\mpm\winnt\mpm.h > .\include\mpm.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\server\mpm\winnt\mpm_default.h
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm_default.h
-InputPath=.\server\mpm\winnt\mpm_default.h
-
-".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\server\mpm\winnt\mpm_default.h > .\include\mpm_default.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm_default.h
-InputPath=.\server\mpm\winnt\mpm_default.h
-
-".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\server\mpm\winnt\mpm_default.h > .\include\mpm_default.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\os\win32\os.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
@@ -478,6 +336,23 @@ SOURCE=.\server\test_char.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\server\buildmark.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\config.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\connection.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\core.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\modules\http\http_core.c
 # End Source File
 # Begin Source File
@@ -490,7 +365,19 @@ SOURCE=.\modules\http\http_request.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\http\mod_core.h
+SOURCE=.\server\log.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\protocol.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\request.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\vhost.c
 # End Source File
 # End Group
 # Begin Group "modules"
@@ -504,16 +391,16 @@ SOURCE=.\modules\mappers\mod_so.c
 
 SOURCE=.\modules\arch\win32\mod_win32.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\os\win32\modules.c
+# End Source File
 # End Group
 # Begin Group "util"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\os\win32\ap_regkey.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\server\error_bucket.c
 # End Source File
 # Begin Source File
@@ -594,6 +481,14 @@ SOURCE=.\include\ap_listen.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\os\win32\ap_regkey.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\ap_regkey.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\ap_mpm.h
 # End Source File
 # Begin Source File
@@ -603,6 +498,31 @@ SOURCE=.\server\listen.c
 # Begin Source File
 
 SOURCE=.\server\mpm\winnt\mpm.h
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mpm.h
+InputPath=.\server\mpm\winnt\mpm.h
+
+".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	type .\server\mpm\winnt\mpm.h > .\include\mpm.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mpm.h
+InputPath=.\server\mpm\winnt\mpm.h
+
+".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	type .\server\mpm\winnt\mpm.h > .\include\mpm.h
+
+# End Custom Build
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
@@ -615,10 +535,31 @@ SOURCE=.\include\mpm_common.h
 # Begin Source File
 
 SOURCE=.\server\mpm\winnt\mpm_default.h
-# End Source File
-# Begin Source File
 
-SOURCE=.\include\mpm_status.h
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mpm_default.h
+InputPath=.\server\mpm\winnt\mpm_default.h
+
+".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	type .\server\mpm\winnt\mpm_default.h > .\include\mpm_default.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mpm_default.h
+InputPath=.\server\mpm\winnt\mpm_default.h
+
+".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	type .\server\mpm\winnt\mpm_default.h > .\include\mpm_default.h
+
+# End Custom Build
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
@@ -636,9 +577,48 @@ SOURCE=.\server\mpm\winnt\nt_eventlog.c
 
 SOURCE=.\server\mpm\winnt\service.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\server\scoreboard.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\scoreboard.h
+# End Source File
 # End Group
 # Begin Source File
 
+SOURCE=.\server\gen_test_char.exe
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__GEN_T=".\include\os.h"	
+# Begin Custom Build - Generating test_char.h from gen_test_char.exe
+InputPath=.\server\gen_test_char.exe
+
+".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	.\server\gen_test_char.exe >.\server\test_char.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__GEN_T=".\include\os.h"	
+# Begin Custom Build - Generating test_char.h from gen_test_char.exe
+InputPath=.\server\gen_test_char.exe
+
+".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	.\server\gen_test_char.exe >.\server\test_char.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\build\win32\libhttpd.rc
 # End Source File
 # Begin Source File