2009-01-02 Ivan N. Zlatev <contact@i-nz.net>

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

diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index 9071ae8a5e03c2f6baa46ed665d8920bb7609349..58114dd90725b96b2cad02f96077c4f03d49aa7f 100644 (file)
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -9,34 +9,50 @@ system = System.dll
 else
 system = $(topdir)/class/lib/$(PROFILE)/System.dll
 endif
-       
+
 ifeq (net_2_0, $(PROFILE))
-OTHER_LIB_MCS_FLAGS = /r:System.Configuration.dll
+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                       \
+
+
+ifeq (net_1_1_java, $(PROFILE))
+OTHER_RES = $(RESOURCE_FILES)
+LIB_MCS_FLAGS +=       \
+       -r:rt.dll                               \
+       -r:J2SE.Helpers.dll                     \
        $(OTHER_LIB_MCS_FLAGS)
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618
+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               \
+       $(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
+       app_test_2.0.config                     \
+       Test/System.Data/binserialize/*.bin
 
 BUILT_SOURCES = Mono.Data.SqlExpressions/Parser.cs
 
@@ -51,4 +67,3 @@ $(test_lib): $(test_lib).config
 $(test_lib).config: app_test_2.0.config
        cp $< $@
 endif
-