Correct Win32 Expat build.

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

diff --git a/Apache.dsw b/Apache.dsw
index b8b191691830cb7f3c85e959fa7c74f48b3c9f9c..16bda879f41b94e2148319e9b5d2fc32fed6c6f7 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -534,7 +534,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "xmlparse"=".\os\win32\xmlparse.dsp" - Package Owner=<4>
+Project: "xmlparse"=".\lib\expat-lite\xmlparse.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -549,7 +549,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "xmltok"=".\os\win32\xmltok.dsp" - Package Owner=<4>
+Project: "xmltok"=".\lib\expat-lite\xmltok.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Makefile.win b/Makefile.win
index f6117f731b2b5101e0b145a322eaaa3124f64a3c..24cb2d9f5104e79765119f238607560038abbc21 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -115,6 +115,8 @@ _install:
        copy Apache$(SHORT)\Apache.exe $(INSTDIR)
        copy Core$(SHORT)\ApacheCore.dll $(INSTDIR)
        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

diff --git a/os/win32/.cvsignore b/os/win32/.cvsignore
index 3aa5c020a555943b7605c6fc1eca738d80f22b91..115c81b2ec3a8f50d9006baa7fe97f3d184c1908 100644 (file)
--- a/os/win32/.cvsignore
+++ b/os/win32/.cvsignore
@@ -27,7 +27,3 @@ ApacheModuleStatusD
 ApacheModuleStatusR
 ApacheModuleUserTrackD
 ApacheModuleUserTrackR
-XMLParseD
-XMLParseR
-XMLTokD
-XMLTokR

diff --git a/srclib/expat-lite/.cvsignore b/srclib/expat-lite/.cvsignore
index e169ece3e003530ba532d51ed4603a4ba9dff408..d4a1821abe2e8ca41ecaf53944b42b592b565d48 100644 (file)
--- a/srclib/expat-lite/.cvsignore
+++ b/srclib/expat-lite/.cvsignore
@@ -7,3 +7,8 @@ Makefile
 *.so
 *.dll
 *.def
+*.plg
+XMLParseD
+XMLParseR
+XMLTokD
+XMLTokR