[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 8990125c76923e5edc0570631c79d00e980b93bc..2fb0b08ecd5ca399090d45d510a4b654bae5dd90 100644 (file)
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -24,14 +24,7 @@ LIB_MCS_FLAGS = \
        -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)
-else 
-MOBILE := $(filter monotouch monodroid, $(PROFILE))
+MOBILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE))
 ifdef MOBILE
 LIB_MCS_FLAGS += \
        -r:Mono.Data.Tds.dll \
@@ -42,9 +35,8 @@ LIB_MCS_FLAGS += \
        -r:Mono.Data.Tds.dll \
        $(OTHER_LIB_MCS_FLAGS)
 endif
-endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.Core.dll -r:Mono.Data.Sqlite.dll -nowarn:618,169,612,219,168
 
 TEST_MONO_PATH = .
 
@@ -57,19 +49,20 @@ EXTRA_DISTFILES = \
        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
+       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 $(CURDIR)/$< >$@
+       $(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