Simplify and order the dependencies as well as possible.

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

diff --git a/Apache.dsw b/Apache.dsw
index 05940e3bb9813ae8a5c332b901bb4b9d2687cd8c..05a2eae0f1bea78f057f7f7e15183b631ad136af 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -3,84 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 5.00
 
 ###############################################################################
 
-Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libhttpd
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "httpd"=".\httpd.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gen_test_char
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gen_uri_delims
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name sdbmlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libhttpd"=".\libhttpd.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pcre
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pcreposix
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name httpd
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -89,12 +11,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name httpd
-    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name Apache
     End Project Dependency
@@ -111,6 +27,9 @@ Package=<4>
     Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_dav_fs
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_expires
     End Project Dependency
     Begin Project Dependency
@@ -132,10 +51,10 @@ Package=<4>
     Project_Dep_Name mod_usertrack
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name htpasswd
+    Project_Dep_Name ab
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name rotatelogs
+    Project_Dep_Name htpasswd
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name htdigest
@@ -144,31 +63,13 @@ Package=<4>
     Project_Dep_Name logresolve
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ab
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libhttpd
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pcreposix
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_dav
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_dav_fs
+    Project_Dep_Name rotatelogs
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
+Project: "apr"=".\srclib\apr\apr.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -176,20 +77,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name httpd
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name aprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "apr"=".\srclib\apr\apr.dsp" - Package Owner=<4>
+Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -216,7 +108,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
+Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -224,6 +116,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name aprutil
+    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libapr
     End Project Dependency
@@ -231,7 +126,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
+Project: "libexpat"=".\srclib\expat-lite\libexpat.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -239,12 +134,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name aprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -261,7 +150,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libexpat"=".\srclib\expat-lite\libexpat.dsp" - Package Owner=<4>
+Project: "pcre"=".\srclib\pcre\pcre.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -269,11 +158,14 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name dftables
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
+Project: "pcreposix"=".\srclib\pcre\pcreposix.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -282,16 +174,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name aprutil
+    Project_Dep_Name pcre
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
+Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -299,17 +188,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name aprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
+Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -317,17 +200,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name aprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
+Project: "httpd"=".\httpd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -335,20 +212,23 @@ Package=<5>
 
 Package=<4>
 {{{
+    Project_Dep_Name libapr
+    End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name apr
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name httpd
+    Project_Dep_Name gen_test_char
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprutil
+    Project_Dep_Name gen_uri_delims
     End Project Dependency
+    Begin Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
+Project: "libhttpd"=".\libhttpd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -357,10 +237,22 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprutil
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pcre
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pcreposix
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name httpd
     End Project Dependency
 }}}
 
@@ -380,9 +272,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -395,17 +284,14 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libhttpd
-    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name sdbmlib
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libaprutil
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -423,10 +309,10 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libhttpd
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libaprutil
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -446,9 +332,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -461,14 +344,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libhttpd
-    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libaprutil
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -482,23 +362,17 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libhttpd
-    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name sdbmlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_dav
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libexpat
+    Project_Dep_Name libhttpd
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libaprutil
+    Project_Dep_Name mod_dav
     End Project Dependency
 }}}
 
@@ -518,9 +392,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -539,9 +410,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -560,9 +428,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -581,9 +446,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -602,9 +464,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -623,9 +482,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -644,9 +500,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -665,14 +518,29 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_usertrack"=".\modules\metadata\mod_usertrack.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name libaprutil
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_usertrack"=".\modules\metadata\mod_usertrack.dsp" - Package Owner=<4>
+Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -686,14 +554,29 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name libaprutil
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "pcre"=".\srclib\pcre\pcre.dsp" - Package Owner=<4>
+Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -702,13 +585,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name dftables
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "pcreposix"=".\srclib\pcre\pcreposix.dsp" - Package Owner=<4>
+Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -717,12 +603,27 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name pcre
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
     End Project Dependency
 }}}
 
 ###############################################################################
 
+Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4>
 
 Package=<5>