eliminate entries from libhttpd.def that are also in libaprutil.def

[apache] / Apache.dsw

diff --git a/Apache.dsw b/Apache.dsw
index 6d9291a82eaafae8c477b5c5c6b2492714eed0af..b2b5cb202ed48c729fdc89e6555fe617c53a847a 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 5.00
 
 ###############################################################################
 
-Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
+Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -12,46 +12,64 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name Apache
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name mod_auth_anon
     End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ApacheCore"=".\ApacheCore.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name mod_auth_dbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ap
+    Project_Dep_Name mod_auth_digest
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name gen_test_char
+    Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name gen_uri_delims
+    Project_Dep_Name mod_dav_fs
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name pcreposix
+    Project_Dep_Name mod_expires
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name pcre
+    Project_Dep_Name mod_file_cache
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_headers
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_rewrite
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_speling
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_status
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_usertrack
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ab
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name htpasswd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name htdigest
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name logresolve
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name rotatelogs
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleAuthAnon"=".\os\win32\ApacheModuleAuthAnon.dsp" - Package Owner=<4>
+Project: "apr"=".\srclib\apr\apr.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -59,17 +77,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleAuthDigest"=".\os\win32\ApacheModuleAuthDigest.dsp" - Package Owner=<4>
+Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -77,17 +89,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleCERNMeta"=".\os\win32\ApacheModuleCERNMeta.dsp" - Package Owner=<4>
+Project: "libapr"=".\srclib\apr\libapr.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -96,16 +102,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleExpires"=".\os\win32\ApacheModuleExpires.dsp" - Package Owner=<4>
+Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -114,16 +117,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name aprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name libapr
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleFileCache"=".\os\win32\ApacheModuleFileCache.dsp" - Package Owner=<4>
+Project: "libexpat"=".\srclib\expat-lite\libexpat.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -131,17 +134,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleHeaders"=".\os\win32\ApacheModuleHeaders.dsp" - Package Owner=<4>
+Project: "dftables"=".\srclib\pcre\dftables.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -149,17 +146,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleInfo"=".\os\win32\ApacheModuleInfo.dsp" - Package Owner=<4>
+Project: "pcre"=".\srclib\pcre\pcre.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -168,16 +159,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name dftables
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleProxy"=".\modules\proxy\ApacheModuleProxy.dsp" - Package Owner=<4>
+Project: "pcreposix"=".\srclib\pcre\pcreposix.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -186,16 +174,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name pcre
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleRewrite"=".\os\win32\ApacheModuleRewrite.dsp" - Package Owner=<4>
+Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -203,17 +188,23 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleSpeling"=".\os\win32\ApacheModuleSpeling.dsp" - Package Owner=<4>
+Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "httpd"=".\httpd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -222,16 +213,22 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name gen_test_char
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name gen_uri_delims
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleStatus"=".\os\win32\ApacheModuleStatus.dsp" - Package Owner=<4>
+Project: "libhttpd"=".\libhttpd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -240,16 +237,28 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    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
 }}}
 
 ###############################################################################
 
-Project: "ApacheModuleUserTrack"=".\os\win32\ApacheModuleUserTrack.dsp" - Package Owner=<4>
+Project: "mod_auth_anon"=".\modules\aaa\mod_auth_anon.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -258,16 +267,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
+Project: "mod_auth_dbm"=".\modules\aaa\mod_auth_dbm.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -276,64 +285,121 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name Apache
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleAuthAnon
+    Project_Dep_Name libhttpd
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_auth_digest"=".\modules\aaa\mod_auth_digest.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleAuthDigest
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleCERNMeta
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleExpires
+    Project_Dep_Name libhttpd
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_cern_meta"=".\modules\metadata\mod_cern_meta.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleFileCache
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleHeaders
+    Project_Dep_Name libhttpd
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_dav"=".\modules\dav\main\mod_dav.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleRewrite
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleSpeling
-    End Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency    
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleStatus
+    Project_Dep_Name libhttpd
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_dav_fs"=".\modules\dav\fs\mod_dav_fs.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleUserTrack
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name htpasswd
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name rotatelogs
+    Project_Dep_Name libhttpd
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name htdigest
+    Project_Dep_Name mod_dav
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_expires"=".\modules\metadata\mod_expires.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
     Begin Project Dependency
-    Project_Dep_Name logresolve
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ab
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
+Project: "mod_file_cache"=".\modules\cache\mod_file_cache.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -342,16 +408,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ap
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ap"=".\ap\ap.dsp" - Package Owner=<4>
+Project: "mod_headers"=".\modules\metadata\mod_headers.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -360,13 +426,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "aprlib"=".\lib\apr\aprlib.dsp" - Package Owner=<4>
+Project: "mod_info"=".\modules\generators\mod_info.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -374,11 +443,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "aprlibdll"=".\lib\apr\aprlibdll.dsp" - Package Owner=<4>
+Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -387,13 +462,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "dftables"=".\lib\pcre\dftables.dsp" - Package Owner=<4>
+Project: "mod_rewrite"=".\modules\mappers\mod_rewrite.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -401,11 +479,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "gen_test_char"=".\main\gen_test_char.dsp" - Package Owner=<4>
+Project: "mod_speling"=".\modules\mappers\mod_speling.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -413,11 +497,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "gen_uri_delims"=".\main\gen_uri_delims.dsp" - Package Owner=<4>
+Project: "mod_status"=".\modules\generators\mod_status.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -425,11 +515,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
+Project: "mod_usertrack"=".\modules\metadata\mod_usertrack.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -438,13 +534,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
+Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -453,16 +552,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ap
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "install"=".\os\win32\installer\installdll\install.dsp" - Package Owner=<4>
+Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -471,13 +570,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    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>
+Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -486,13 +588,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "pcre"=".\lib\pcre\pcre.dsp" - Package Owner=<4>
+Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -501,13 +606,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"=".\lib\pcre\pcreposix.dsp" - Package Owner=<4>
+Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -515,9 +623,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name pcre
-    End Project Dependency
 }}}
 
 ###############################################################################