X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Data%2FMakefile;h=58114dd90725b96b2cad02f96077c4f03d49aa7f;hb=65b7926385b1bb92689fb14add730a29fdb863c8;hp=0565172617da04947c5abe6acb696a6858eb7ac3;hpb=0abc2e6270020edc4a5b4c66f93b4ae582815f20;p=mono.git

diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index 0565172617d..58114dd9072 100644
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -10,27 +10,49 @@ else
 system = $(topdir)/class/lib/$(PROFILE)/System.dll
 endif
 
+ifeq (net_2_0, $(PROFILE))
+OTHER_LIB_MCS_FLAGS = -r:System.Configuration.dll \
+			-r:System.Transactions.dll
+endif
+
 LIBRARY = System.Data.dll
 LIB_MCS_FLAGS = \
-	/nowarn:649 /nowarn:169 /nowarn:219 /nowarn:168 /nowarn:1595 \
-	/r:$(corlib)				\
-	/r:$(system)			 	\
-	/r:System.Xml.dll 			\
-	/r:System.EnterpriseServices.dll 	\
-	/r:Mono.Data.Tds.dll
+	-nowarn:649 \
+	-unsafe \
+	-r:$(corlib)				\
+	-r:$(system)			 	\
+	-r:System.Xml.dll 			\
+
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618
+ifeq (net_1_1_java, $(PROFILE))
+OTHER_RES = $(RESOURCE_FILES)
+LIB_MCS_FLAGS +=	\
+	-r:rt.dll				\
+	-r:J2SE.Helpers.dll			\
+	$(OTHER_LIB_MCS_FLAGS)
+
+else
+LIB_MCS_FLAGS += \
+	-r:System.EnterpriseServices.dll 	\
+	-r:Mono.Data.Tds.dll \
+	$(OTHER_LIB_MCS_FLAGS)
+endif
+
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168
+
+TEST_MONO_PATH = .
 
 EXTRA_DISTFILES = \
 	TODO					\
-	Test/System.Data/region.xml		\
-	Test/System.Data/store.xsd		\
-	Test/System.Data/own_schema.xsd		\
-	Test/System.Xml/2books.xml		\
-	Test/System.Xml/region.xml		\
-	Test/System.Xml/region.xsd		\
-	Test/System.Xml/store.xsd		\
-	Mono.Data.SqlExpressions/Parser.jay
+	$(wildcard Test/System.Data/*.xml)		\
+	$(wildcard Test/System.Data/*.xsd)		\
+	$(wildcard Test/System.Xml/*.xml)		\
+	$(wildcard Test/System.Xml/*.xsd)		\
+	Test/System.Data/schemas/ChangeLog	\
+	$(wildcard Test/System.Data/schemas/*.xsd)		\
+	Mono.Data.SqlExpressions/Parser.jay	\
+	app_test_2.0.config			\
+	Test/System.Data/binserialize/*.bin
 
 BUILT_SOURCES = Mono.Data.SqlExpressions/Parser.cs
 
@@ -38,3 +60,10 @@ Mono.Data.SqlExpressions/Parser.cs: Mono.Data.SqlExpressions/Parser.jay $(topdir
 	$(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@
 
 include ../../build/library.make
+
+ifeq (net_2_0, $(PROFILE))
+$(test_lib): $(test_lib).config
+
+$(test_lib).config: app_test_2.0.config
+	cp $< $@
+endif