Bring in the expat.lib into the static aprutil.lib win32 library.

  Fix up the build order that messed up command-line builds due to
  the recent dependency of apr-util on expat-lite.

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

diff --git a/Apache.dsw b/Apache.dsw
index e8741d4e4b11013f13f712c75d47d720fe0a3c79..bbcea385d4fdc08cfe7467e312bfd97d80129373 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
+Microsoft Developer Studio Workspace File, Format Version 5.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
@@ -86,6 +86,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name rotatelogs
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_info
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -129,7 +132,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name libexpat
+    Project_Dep_Name expat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
@@ -147,6 +153,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "expat"=".\srclib\expat-lite\expat.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
 
 Package=<5>

diff --git a/Makefile.win b/Makefile.win
index 28757e783202f7d9f4b457471aece6681cac33ab..6685f6b75d78c47eef949968ed1afe233cd1a6f9 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -65,13 +65,14 @@ _build:
         $(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
+       cd srclib\expat-lite
+        $(MAKE) $(MAKEOPT) -f expat.mak CFG="expat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f libexpat.mak CFG="libexpat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
        cd srclib\apr-util
         $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
-       cd srclib\expat-lite
-        $(MAKE) $(MAKEOPT) -f libexpat.mak CFG="libexpat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-       cd ..\..
        cd srclib\pcre
         $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -99,7 +100,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_dav_fs.mak CFG="mod_dav_fs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..\..
        cd modules\generators
-#        $(MAKE) $(MAKEOPT) -f mod_info.mak CFG"=mod_info - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+         $(MAKE) $(MAKEOPT) -f mod_info.mak CFG"=mod_info - Win32 $(LONG)" RECURSE=0 $(CTARGET)
          $(MAKE) $(MAKEOPT) -f mod_status.mak CFG="mod_status - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd modules\mappers
@@ -112,9 +113,9 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_headers.mak CFG="mod_headers - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_usertrack.mak CFG="mod_usertrack - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
-       cd modules\proxy
+#      cd modules\proxy
 #        $(MAKE) $(MAKEOPT) -f mod_proxy.mak CFG="mod_proxy - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        cd ..\..
+#       cd ..\..
        cd support
          $(MAKE) $(MAKEOPT) -f ab.mak CFG="ab - Win32 $(LONG)" RECURSE=0 $(CTARGET)
          $(MAKE) $(MAKEOPT) -f htpasswd.mak CFG="htpasswd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -150,7 +151,7 @@ _install:
        copy modules\cache\$(LONG)\mod_file_cache.so "$(INSTDIR)\modules"
         copy modules\dav\fs\$(LONG)\mod_dav_fs.so "$(INSTDIR)\modules"
         copy modules\dav\main\$(LONG)\mod_dav.so "$(INSTDIR)\modules"
-#       copy modules\generators\$(LONG)\mod_info.so "$(INSTDIR)\modules"
+        copy modules\generators\$(LONG)\mod_info.so "$(INSTDIR)\modules"
         copy modules\generators\$(LONG)\mod_status.so "$(INSTDIR)\modules"
         copy modules\mappers\$(LONG)\mod_rewrite.so "$(INSTDIR)\modules"
        copy modules\mappers\$(LONG)\mod_speling.so "$(INSTDIR)\modules"