Merge pull request #2670 from lambdageek/dev/monoerror-mono_runtime_object_init

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

diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile
index 0ef8e6e2811a72a8312f225f1f9250b607b2e9de..03dbd5fd9e59d7fd8b5b225e7ed63040f22fc059 100644 (file)
--- a/mcs/class/System.ServiceModel/Makefile
+++ b/mcs/class/System.ServiceModel/Makefile
@@ -13,41 +13,39 @@ LIB_MCS_FLAGS = \
                /nowarn:414,169,67,3005,436,219,618 \
                /unsafe \
                /d:TRACE \
-               /r:System.dll \
-               /r:System.Xml.dll \
-               /r:System.Core.dll \
-               /r:System.Runtime.Serialization.dll \
                $(RESOURCE_FILES:%=/resource:%)
 
+ifdef XAMMAC_4_5
+LIB_REFS += System.ServiceModel.Internals
+endif
+
 ifneq (2.1, $(FRAMEWORK_VERSION))
-LIB_REFS += System.Configuration System.Data System.Security System.IdentityModel System.IdentityModel.Selectors System.Transactions System.Messaging System.Web System.Web.Services Mono.Security
-LIB_MCS_FLAGS += /d:NET_3_0    \
-                       /r:System.Configuration.dll \
-                       /r:System.Data.dll      \
-                       /r:System.Security.dll \
-                       /r:System.IdentityModel.dll \
-                       /r:System.IdentityModel.Selectors.dll \
-                       /r:System.Transactions.dll \
-                       /r:System.Messaging.dll \
-                       /r:System.Web.dll \
-                       /r:System.Web.Services.dll \
-                       /r:Mono.Security.dll
+LIB_REFS += System.Configuration System.Data System.Security System.IdentityModel System.IdentityModel.Selectors System.Transactions System.Messaging System.Web.Services Mono.Security
+LIB_MCS_FLAGS += /d:NET_3_0
+
+ifndef NO_SYSTEM_WEB_DEPENDENCY
+LIB_REFS += System.Web
 endif
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
-LIB_REFS += System.Web.ApplicationServices
-LIB_MCS_FLAGS += /r:System.Web.ApplicationServices.dll
+
+ifndef NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY
 activation = $(the_libdir_base)System.ServiceModel.Activation.dll
 servicemodel_deps = $(activation)
 
 ifneq (plainservice/,$(intermediate))
-LIB_REFS += System.ServiceModel.Activation
 LIB_MCS_FLAGS += -define:HAS_ACTIVATION -r:System.ServiceModel.Activation.dll
+endif 
+endif # NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY
+
+ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY
 LIB_REFS += System.Web.ApplicationServices
-LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll
-endif
 endif
 
+endif # (4, $(FRAMEWORK_VERSION_MAJOR))
+
+endif # (2.1, $(FRAMEWORK_VERSION))
+
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 TEST_EXTRA_FILES = \