Revert "Merge pull request #5330 from alexanderkyte/dedup_mkbundle"

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

diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index 23554997cb6a1f6bbc10ffebbdc6f1a9e587e2c3..7a7647521db988500f37329a3f74d10eabcbccab 100644 (file)
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -14,6 +14,14 @@ RESOURCE_FILES = \
        resources/Question.wav
 endif
 
+RESX_RESOURCE_STRING = \
+       ../../../external/corefx/src/System.Collections.Concurrent/src/Resources/Strings.resx \
+       ../../../external/corefx/src/System.Collections/src/Resources/Strings.resx \
+       ../../../external/corefx/src/System.Buffers/src/Resources/Strings.resx \
+       ../../../external/corefx/src/System.Private.Uri/src/Resources/Strings.resx \
+       ../../../external/corefx/src/System.IO.Ports/src/Resources/Strings.resx \
+       ../../../external/corefx/src/System.Net.HttpListener/src/Resources/Strings.resx
+
 TEST_RESOURCES = \
        Test/System/test-uri-props.txt \
        Test/System/test-uri-props-manual.txt \
@@ -32,7 +40,12 @@ endif
 
 ifndef MOBILE_PROFILE
 LIB_MCS_FLAGS += -d:CODEDOM
-TEST_LIB_REFS = System.Drawing $(MONO_SECURITY) System.Data System.Xml System.Core System.Configuration
+TEST_LIB_REFS = $(MONO_SECURITY) System.Data System.Xml System.Core System.Configuration
+
+ifndef NO_SYSTEM_DRAWING_DEPENDENCY
+TEST_LIB_REFS += System.Drawing
+endif
+
 else
 LIB_MCS_FLAGS += -nowarn:618
 TEST_LIB_REFS = $(MONO_SECURITY) System.Data System.Xml System.Core
@@ -49,6 +62,14 @@ REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START
 TEST_MCS_FLAGS += -d:MONO_FEATURE_PROCESS_START
 endif
 
+ifdef MONO_FEATURE_APPLETLS
+LIB_MCS_FLAGS += -d:MONO_FEATURE_APPLETLS
+endif
+
+ifdef ONLY_APPLETLS
+LIB_MCS_FLAGS += -d:ONLY_APPLETLS
+endif
+
 ifndef PROFILE_DISABLE_BTLS
 ifdef HAVE_BTLS
 
@@ -99,6 +120,7 @@ endif
 
 EXTRA_DISTFILES = \
        common.sources                                  \
+       common_networking.sources               \
        Test/test-config-file                           \
        Test/System.Security.Cryptography.X509Certificates/pkits/Makefile       \
        Test/System.Security.Cryptography.X509Certificates/pkits/README         \