Convert jgac to java_refs, and jre6 to jre

[mono.git] / mcs / class / System.XML / Makefile

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index 90cbb9f25217d2f58a6f8bd382a5bebb4354221f..2288ccffd5056af23bfce1445a5ae45dba561d91 100644 (file)
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -5,12 +5,6 @@ include ../../build/rules.make
 LIBRARY = System.Xml.dll
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
-ifeq ($(PROFILE),atomic)
-SCARY_LIB=
-else
-SCARY_LIB=/lib:$(prefix)/lib /noconfig
-endif
-
 lib_file := $(wildcard ../lib/$(PROFILE)/System.Xml.dll)
 ifndef lib_file
 # In the basic profile, System.Xml.dll is _not_ a dependency of mcs.exe.  So, don't use boot compilation.
@@ -28,27 +22,73 @@ ifdef USE_BOOT_COMPILE
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 endif
 
-LIB_MCS_FLAGS = $(SCARY_LIB) /unsafe /r:$(corlib) /r:System.dll /nowarn:0162 /nowarn:0618 /nowarn:0612
+LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -nowarn:0162,0618,0612,0642,1595
+ifeq (net_1_1_java, $(PROFILE))
+LIB_MCS_FLAGS += \
+       -r:System.Xml.dll               \
+       -r:rt.dll                       \
+       -r:J2SE.Helpers.dll             \
+       -r:unresolved.dll               \
+       /lib:../../class/lib/$(PROFILE)
+endif
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
 
+ifeq (2.0, $(FRAMEWORK_VERSION))
+# Happens on net_2_0_bootstrap and net_2_0 profiles
+CONFIGURATION_DEP := System.Configuration.dll
+CONFIGURATION_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(CONFIGURATION_DEP))
+CYCLIC_DEPS += $(CONFIGURATION_DEP)
+CYCLIC_DEP_FILES += $(CONFIGURATION_DEP_FILE)
+TEST_MCS_FLAGS += -r:System.Configuration
+endif
+
+ifdef CONFIGURATION_DEP_FILE
+LIB_MCS_FLAGS += -define:CONFIGURATION_DEP -r:$(CONFIGURATION_DEP)
+$(the_lib): $(CONFIGURATION_DEP_FILE)
+endif
+
+nist_dom_files = \
+       ChangeLog ITest.cs readme.txt util.cs \
+       fundamental/ChangeLog \
+       files/ChangeLog files/noDTDXMLfile.xml files/otherDoc.xml files/staff.dtd files/staff.html files/staff.xml
+
+xmlfiles_files = \
+       ChangeLog nested-included.dtd literal-data.xml nested-dtd-test.dtd nested-dtd-test.xml simple.xml \
+       xsl/ChangeLog xsl/empty.xsl \
+       XsdValidation/ChangeLog XsdValidation/1.xsd XsdValidation/2.xsd XsdValidation/3.xsd XsdValidation/4.xsd \
+       xsd/ChangeLog xsd/1.xsd xsd/2.xsd xsd/3.xsd xsd/4.xsd xsd/5.xsd xsd/6.xsd xsd/xml.xsd
+
 EXTRA_DISTFILES = \
-       Mono.System.XML.csproj          \
-       Mono.System.XML.sln             \
-       README                          \
        System.Xml.Schema/BUGS-MS.txt   \
        System.Xml.Schema/BUGS.txt      \
        $(wildcard System.Xml.Serialization/standalone_tests/*.cs) \
        $(wildcard System.Xml.Serialization/standalone_tests/*.output) \
        System.Xml.XPath/Parser.jay     \
-       System.Xml.Query/skeleton-2.0.cs        \
+       Test/ChangeLog                  \
        Test/Microsoft.Test.csproj      \
        Test/Mono.Test.csproj           \
        Test/MonoMicro.Test.csproj      \
-       Test/XmlFiles/xsd/xml.xsd       \
-       Test/XmlFiles/xsd/ChangeLog     \
-       Test/XmlFiles/xsl/empty.xsl     \
-       Test/XmlFiles/xsl/ChangeLog     \
-       Test/XmlFiles/ChangeLog
+       Test/XmlFiles/76102.xml         \
+       Test/XmlFiles/79683.dtd         \
+       Test/XmlFiles/xsd/multi-schemaLocation.xml \
+       Test/XmlFiles/xsd/datatypesTest.xsd \
+       Test/XmlFiles/xsd/77687.xsd     \
+       Test/XmlFiles/xsd/77687inc.xsd  \
+       Test/XmlFiles/xsd/78985.xml     \
+       Test/XmlFiles/xsd/78985.xsd     \
+       Test/XmlFiles/xsd/79650.xsd     \
+       Test/XmlFiles/xsd/inter-inc-1.xsd \
+       Test/XmlFiles/xsl/91834.xml     \
+       Test/XmlFiles/xsl/91834.xsl     \
+       Test/XmlFiles/xsl/91834a.xml    \
+       Test/XmlFiles/xsl/stripspace.xsl \
+       Test/XmlFiles/xsl/stripspace.xml \
+       Test/XmlFiles/xsl/current-in-select.xsl \
+       Test/XmlFiles/xsl/current-in-select.xml \
+       Test/XmlFiles/xsl/current-in-select.ref \
+       Test/XmlFiles/xsl/ChangeLog \
+       $(xmlfiles_files:%=Test/XmlFiles/%) \
+       $(nist_dom_files:%=Test/System.Xml/nist_dom/%)
 
 System.Xml.XPath/Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
        $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@