Second half of the ugly name to nice name change. Clean your tree

  before you grab this set :-)

Reviewed by:	rbb, stoddard

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

diff --git a/Apache.dsw b/Apache.dsw
index eb4d3f51a93691633a4b825eb3290965be47cf95..f9e4a8add64e2aba7607344156ebfa8be8cbb9d5 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -69,7 +69,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleAuthAnon"=".\os\win32\ApacheModuleAuthAnon.dsp" - Package Owner=<4>
+Project: "mod_auth_anon"=".\os\win32\mod_auth_anon.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -87,7 +87,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleAuthDBM"=".\os\win32\ApacheModuleAuthDBM.dsp" - Package Owner=<4>
+Project: "mod_auth_dbm"=".\os\win32\mod_auth_dbm.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -108,7 +108,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleAuthDigest"=".\os\win32\ApacheModuleAuthDigest.dsp" - Package Owner=<4>
+Project: "mod_auth_digest"=".\os\win32\mod_auth_digest.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -126,7 +126,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleCERNMeta"=".\os\win32\ApacheModuleCERNMeta.dsp" - Package Owner=<4>
+Project: "mod_cern_meta"=".\os\win32\mod_cern_meta.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -144,7 +144,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleExpires"=".\os\win32\ApacheModuleExpires.dsp" - Package Owner=<4>
+Project: "mod_expires"=".\os\win32\mod_expires.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -162,7 +162,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleFileCache"=".\os\win32\ApacheModuleFileCache.dsp" - Package Owner=<4>
+Project: "mod_file_cache"=".\os\win32\mod_file_cache.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -180,7 +180,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleHeaders"=".\os\win32\ApacheModuleHeaders.dsp" - Package Owner=<4>
+Project: "mod_headers"=".\os\win32\mod_headers.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -198,7 +198,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleInfo"=".\os\win32\ApacheModuleInfo.dsp" - Package Owner=<4>
+Project: "mod_info"=".\os\win32\mod_info.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -216,7 +216,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleProxy"=".\modules\proxy\ApacheModuleProxy.dsp" - Package Owner=<4>
+Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -234,7 +234,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleRewrite"=".\os\win32\ApacheModuleRewrite.dsp" - Package Owner=<4>
+Project: "mod_rewrite"=".\os\win32\mod_rewrite.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -252,7 +252,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleSpeling"=".\os\win32\ApacheModuleSpeling.dsp" - Package Owner=<4>
+Project: "mod_speling"=".\os\win32\mod_speling.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -270,7 +270,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleStatus"=".\os\win32\ApacheModuleStatus.dsp" - Package Owner=<4>
+Project: "mod_status"=".\os\win32\mod_status.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -288,7 +288,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ApacheModuleUserTrack"=".\os\win32\ApacheModuleUserTrack.dsp" - Package Owner=<4>
+Project: "mod_usertrack"=".\os\win32\mod_usertrack.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -324,34 +324,37 @@ Package=<4>
     Project_Dep_Name Apache
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleAuthAnon
+    Project_Dep_Name mod_auth_anon
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleAuthDigest
+    Project_Dep_Name mod_auth_dbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleCERNMeta
+    Project_Dep_Name mod_auth_digest
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleExpires
+    Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleFileCache
+    Project_Dep_Name mod_expires
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleHeaders
+    Project_Dep_Name mod_file_cache
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleRewrite
+    Project_Dep_Name mod_headers
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleSpeling
+    Project_Dep_Name mod_rewrite
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleStatus
+    Project_Dep_Name mod_speling
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheModuleUserTrack
+    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 htpasswd
@@ -377,9 +380,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name xmlparse
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheModuleAuthDBM
-    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/Makefile.win b/Makefile.win
index 7307ee09d568bc0196df41e818422f28296a0404..92a64a6a46e9a50346288e0296db23b49a8c6854 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -90,21 +90,21 @@ _build:
         $(MAKE) $(MAKEOPT) -f ApacheCoreDll.mak CFG="ApacheCoreDll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd os\win32
-         $(MAKE) $(MAKEOPT) -f ApacheModuleStatus.mak CFG="ApacheModuleStatus - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-#        $(MAKE) $(MAKEOPT) -f ApacheModuleInfo.mak CFG"=ApacheModuleInfo - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheModuleAuthAnon.mak CFG="ApacheModuleAuthAnon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheModuleAuthDigest.mak CFG="ApacheModuleAuthDigest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheModuleCERNMeta.mak CFG="ApacheModuleCERNMeta - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheModuleExpires.mak CFG="ApacheModuleExpires - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheModuleFileCache.mak CFG="ApacheModuleFileCache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheModuleHeaders.mak CFG="ApacheModuleHeaders - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheModuleSpeling.mak CFG="ApacheModuleSpeling - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheModuleUserTrack.mak CFG="ApacheModuleUserTrack - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-         $(MAKE) $(MAKEOPT) -f ApacheModuleRewrite.mak CFG="ApacheModuleRewrite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-         $(MAKE) $(MAKEOPT) -f ApacheModuleAuthDBM.mak CFG="ApacheModuleAuthDBM - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_auth_anon.mak CFG="mod_auth_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+         $(MAKE) $(MAKEOPT) -f mod_auth_dbm.mak CFG="mod_auth_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_cern_meta.mak CFG="mod_cern_meta - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_expires.mak CFG="mod_expires - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_file_cache.mak CFG="mod_file_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_headers.mak CFG="mod_headers - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+#        $(MAKE) $(MAKEOPT) -f mod_info.mak CFG"=mod_info - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_speling.mak CFG="mod_speling - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+         $(MAKE) $(MAKEOPT) -f mod_status.mak CFG="mod_status - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_usertrack.mak CFG="mod_usertrack - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+         $(MAKE) $(MAKEOPT) -f mod_rewrite.mak CFG="mod_rewrite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
 #       cd modules\proxy
-#        $(MAKE) $(MAKEOPT) -f ApacheModuleProxy.mak CFG="ApacheModuleProxy - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+#        $(MAKE) $(MAKEOPT) -f mod_proxy.mak CFG="mod_proxy - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 #       cd ..\..
        cd support
          $(MAKE) $(MAKEOPT) -f ab.mak CFG="ab - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -125,19 +125,19 @@ _install:
        copy lib\apr\$(LONG)\aprlib.dll $(INSTDIR)
         copy lib\expat-lite\XMLParse$(SHORT)\xmlparse.dll $(INSTDIR)
         copy lib\expat-lite\XMLTok$(SHORT)\xmltok.dll $(INSTDIR)
-        copy os\win32\ApacheModuleStatus$(SHORT)\ApacheModuleStatus.dll $(INSTDIR)\modules
-#       copy os\win32\ApacheModuleInfo$(SHORT)\ApacheModuleInfo.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleAuthAnon$(SHORT)\ApacheModuleAuthAnon.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleAuthDigest$(SHORT)\ApacheModuleAuthDigest.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleCERNMeta$(SHORT)\ApacheModuleCERNMeta.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleExpires$(SHORT)\ApacheModuleExpires.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleFileCache$(SHORT)\ApacheModuleFileCache.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleHeaders$(SHORT)\ApacheModuleHeaders.dll $(INSTDIR)\modules
-        copy os\win32\ApacheModuleRewrite$(SHORT)\ApacheModuleRewrite.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleSpeling$(SHORT)\ApacheModuleSpeling.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleUserTrack$(SHORT)\ApacheModuleUserTrack.dll $(INSTDIR)\modules
-       copy os\win32\ApacheModuleAuthDBM$(SHORT)\ApacheModuleAuthDBM.dll $(INSTDIR)\modules
-#       copy modules\proxy\$(LONG)\ApacheModuleProxy.dll $(INSTDIR)\modules
+        copy os\win32\mod_status$(SHORT)\mod_status.dll $(INSTDIR)\modules
+#       copy os\win32\mod_info$(SHORT)\mod_info.dll $(INSTDIR)\modules
+       copy os\win32\mod_auth_anon$(SHORT)\mod_auth_anon.dll $(INSTDIR)\modules
+       copy os\win32\mod_auth_digest$(SHORT)\mod_auth_digest.dll $(INSTDIR)\modules
+       copy os\win32\mod_cern_meta$(SHORT)\mod_cern_meta.dll $(INSTDIR)\modules
+       copy os\win32\mod_expires$(SHORT)\mod_expires.dll $(INSTDIR)\modules
+       copy os\win32\mod_file_cache$(SHORT)\mod_file_cache.dll $(INSTDIR)\modules
+       copy os\win32\mod_headers$(SHORT)\mod_headers.dll $(INSTDIR)\modules
+        copy os\win32\mod_rewrite$(SHORT)\mod_rewrite.dll $(INSTDIR)\modules
+       copy os\win32\mod_speling$(SHORT)\mod_speling.dll $(INSTDIR)\modules
+       copy os\win32\mod_user_track$(SHORT)\mod_user_track.dll $(INSTDIR)\modules
+       copy os\win32\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules
+#       copy modules\proxy\$(LONG)\mod_proxy.dll $(INSTDIR)\modules
         copy support\$(LONG)\ab.exe $(INSTDIR)\bin
         copy support\$(LONG)\htpasswd.exe $(INSTDIR)\bin
        copy support\$(LONG)\htdigest.exe $(INSTDIR)\bin