[Cleanup] Removed TARGET_JVM

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

diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index a9cb0b6a7f5e468b82e261d4dc0c762565733c01..2fb0b08ecd5ca399090d45d510a4b654bae5dd90 100644 (file)
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -10,40 +10,59 @@ else
 system = $(topdir)/class/lib/$(PROFILE)/System.dll
 endif
 
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
+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
+MOBILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE))
+ifdef MOBILE
+LIB_MCS_FLAGS += \
+       -r:Mono.Data.Tds.dll \
+       -r:System.Transactions.dll
+else
+LIB_MCS_FLAGS += \
+       -r:System.EnterpriseServices.dll        \
+       -r:Mono.Data.Tds.dll \
+       $(OTHER_LIB_MCS_FLAGS)
+endif
+
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.Core.dll -r:Mono.Data.Sqlite.dll -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_net_2_0.config                 \
+       app_test_net_4_5.config                 \
+       Test/System.Data/binserialize/*.bin     \
+       SqliteTest.db
 
 BUILT_SOURCES = Mono.Data.SqlExpressions/Parser.cs
 
 Mono.Data.SqlExpressions/Parser.cs: Mono.Data.SqlExpressions/Parser.jay $(topdir)/jay/skeleton.cs
-       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@
+       $(topdir)/jay/jay -vct < $(topdir)/jay/skeleton.cs $(CURDIR)/$< >$@
+       rm -f y.output
 
 include ../../build/library.make
 
-ifeq (net_2_0, $(PROFILE))
 $(test_lib): $(test_lib).config
 
-$(test_lib).config: app_test_2.0.config
+$(test_lib).config: app_test_$(PROFILE).config
        cp $< $@
-endif
-