[bcl] Specify the name of the key file on the command line instead of using the Assem...

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

diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index 39e46838503c6b687e8c230f2a78558ca3921100..f24fe8932aaffbd19851c2b5cc341b2773a1a32c 100644 (file)
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -5,18 +5,26 @@ include ../../build/rules.make
 LIBRARY = System.Data.dll
 
 LIB_REFS = System System.Xml System.Core System.Numerics
+KEYFILE = ../ecma.pub
 LIB_MCS_FLAGS = \
        -nowarn:219,414,649 \
+       -d:COREFX       \
        -d:PLATFORM_UNIX \
        -d:USEOFFSET \
        -d:MONO_PARTIAL_DATA_IMPORT \
        -unsafe
 
+ifdef NO_MONO_SECURITY
+MONO_DATA_TDS=
+else
+MONO_DATA_TDS=Mono.Data.Tds
+endif
+
 ifdef MOBILE_PROFILE
-LIB_REFS += Mono.Data.Tds System.Transactions
+LIB_REFS += $(MONO_DATA_TDS) System.Transactions
 LIB_MCS_FLAGS += -d:NO_CODEDOM -d:NO_OLEDB -d:NO_ODBC -d:NO_CONFIGURATION
 else
-LIB_REFS += System.EnterpriseServices Mono.Data.Tds System.Configuration System.Transactions
+LIB_REFS += System.EnterpriseServices $(MONO_DATA_TDS) System.Configuration System.Transactions
 BUILT_SOURCES = \
        gen_OdbcConnection.cs \
        gen_OleDbConnection.cs \
@@ -28,9 +36,14 @@ endif
 
 TXT_RESOURCE_STRINGS = ../referencesource/System.Data/system.data.txt
 
+RESX_RESOURCE_STRING = \
+       ../../../external/corefx/src/System.Data.Common/src/Resources/Strings.resx
+
 TEST_LIB_REFS = System.Core Mono.Data.Sqlite
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168
 
+TEST_NUNITLITE_APP_CONFIG_GLOBAL=Test/test-config-file
+
 TEST_MONO_PATH = .
 
 EXTRA_DISTFILES = \
@@ -39,10 +52,11 @@ EXTRA_DISTFILES = \
        $(wildcard Test/System.Xml/*.xml)               \
        $(wildcard Test/System.Xml/*.xsd)               \
        $(wildcard Test/System.Data/schemas/*.xsd)              \
-       app_test_net_4_x.config                 \
+       Test/test-config-file                   \
        Test/System.Data/binserialize/*.bin     \
+       Test/ProviderTests/sql/*.sql    \
        SqliteTest.db   \
-       referencesource.sources
+       corefx.common.sources
 
 gen_OdbcConnection.cs: ../referencesource/System.Data/System/Data/ProviderBase/DbConnectionHelper.cs
        sed -e "s/NAMESPACE/System.Data.Odbc/g" $< |\
@@ -85,8 +99,3 @@ gen_SqlParameterCollection.cs: ../referencesource/System.Data/System/Data/Provid
        sed -e s/PARAMETEROBJECTNAME/SqlParameter/g >$@
 
 include ../../build/library.make
-
-$(test_lib): $(test_lib).config
-
-$(test_lib).config: app_test_$(PROFILE).config
-       cp $< $@