Merge pull request #2338 from BogdanovKirill/httpwritefix3

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

diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index f5aa6a975018768f067e2fab5b79084c20bab36c..5f52ecca39176e02e956f997839208bf77a07d5e 100644 (file)
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -23,20 +23,38 @@ TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:Sy
        $(foreach f, $(TEST_RESOURCES), -resource:$(f),$(notdir $(f)))
 
 REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX
+ifndef NO_PROCESS_START
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START
+TEST_MCS_FLAGS += -d:MONO_FEATURE_PROCESS_START
+endif
+
 LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%)
 TEST_MCS_FLAGS += -r:System.Configuration
-PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE))
 
-ifeq (2.1, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += -d:INSIDE_SYSTEM
+ifndef NO_THREAD_ABORT
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_ABORT
+TEST_MCS_FLAGS += -d:MONO_FEATURE_THREAD_ABORT
 endif
-ifeq (monotouch, $(subst _runtime,,$(PROFILE)))
-LIB_MCS_FLAGS += -d:SECURITY_DEP
+
+ifndef NO_THREAD_SUSPEND_RESUME
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_SUSPEND_RESUME
+TEST_MCS_FLAGS += -d:MONO_FEATURE_THREAD_SUSPEND_RESUME
 endif
-ifeq (monodroid, $(PROFILE))
-LIB_MCS_FLAGS += -d:SECURITY_DEP
+
+RESOURCE_STRINGS = ../../../external/referencesource/System/System.txt
+
+#
+# MOBILE_PROFILE needs SECURITY_DEP, except for XAMMAC
+#
+ifdef MOBILE_PROFILE
+ifeq ($(PROFILE),xammac)
+EXTERN_ALIAS_FLAGS = -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS
+LIB_MCS_FLAGS += -d:INSIDE_SYSTEM
+else
+LIB_MCS_FLAGS += -d:INSIDE_SYSTEM -d:SECURITY_DEP
 endif
-ifndef PROFILE_ANY_MOBILE
+else
+EXTERN_ALIAS_FLAGS = -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS
 FINAL_MCS_FLAGS = -r:System.Configuration.dll -d:CONFIGURATION_DEP
 endif
 
@@ -45,14 +63,16 @@ endif
 #
 ifeq (secxml/, $(intermediate))
 LOCAL_MCS_FLAGS = -lib:$(bare_libdir) 
-LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(bare_libdir)/System.dll -r:System.Xml.dll -r:MonoSecurity=Mono.Security.dll
+LIB_REFS += System.Xml MonoSecurity=Mono.Security
+LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(bare_libdir)/System.dll $(EXTERN_ALIAS_FLAGS)
 endif
 
 #
 # Flags used to build the final version of System (when intermediate is not defined)
 #
 ifndef intermediate
-LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(secxml_libdir)/System.dll -r:System.Xml.dll -r:MonoSecurity=Mono.Security.dll $(FINAL_MCS_FLAGS)
+LIB_REFS += System.Xml MonoSecurity=Mono.Security
+LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(secxml_libdir)/System.dll $(EXTERN_ALIAS_FLAGS) $(FINAL_MCS_FLAGS)
 endif
 
 EXTRA_DISTFILES = \
@@ -73,7 +93,7 @@ system_library_deps := \
        $(the_libdir_base)Mono.Security.dll     \
        $(bare_libdir)/System.dll
 
-ifndef PROFILE_ANY_MOBILE
+ifndef MOBILE_PROFILE
 system_library_deps += $(the_libdir_base)System.Configuration.dll      
 endif
 
@@ -84,7 +104,7 @@ artifacts = $(system_library_deps)                   \
 
 .NOTPARALLEL: $(system_library_deps)
 
-$(the_libdir_base)System.dll: $(system_library_deps) 
+$(the_libdir_base)System.dll: $(system_library_deps) ../Mono.Security/Makefile
 
 ifeq (bare/,$(intermediate))
 build-bare:
@@ -106,7 +126,7 @@ $(the_libdir_base)System.Xml.dll:
 $(bare_libdir)/System.Xml.dll:
        (cd ../System.XML; $(MAKE) $@)
 
-$(the_libdir_base)Mono.Security.dll:
+$(the_libdir_base)Mono.Security.dll: ../Mono.Security/Makefile
        (cd ../Mono.Security; $(MAKE))
 
 $(the_libdir_base)System.Configuration.dll: