X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.XML%2FMakefile;h=2288ccffd5056af23bfce1445a5ae45dba561d91;hb=04f4ba1068a94b241799bd5e7c27694479873735;hp=a48d734b9bb100d931ed9a9f84c192cfdd87d838;hpb=496dfbf9ec0fd3143e5dd560a863d916e56a52b8;p=mono.git

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index a48d734b9bb..2288ccffd50 100644
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -33,6 +33,20 @@ LIB_MCS_FLAGS += \
 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 \
@@ -45,9 +59,6 @@ xmlfiles_files = \
 	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) \
@@ -58,10 +69,15 @@ EXTRA_DISTFILES = \
 	Test/Mono.Test.csproj		\
 	Test/MonoMicro.Test.csproj	\
 	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	\