Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

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

diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile
index d16d22d9e5b2e41d8e6dcc4507e78e91a43c7033..1aaf90fae44cf7210f605f6816acee19aeaa6187 100755 (executable)
--- a/mcs/class/System.ServiceModel/Makefile
+++ b/mcs/class/System.ServiceModel/Makefile
@@ -10,6 +10,7 @@ LIBRARY = System.ServiceModel.dll
 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 \
@@ -30,24 +31,32 @@ LIB_MCS_FLAGS += /d:NET_3_0         \
                        /r:Mono.Security.dll
 endif
 
-ifeq (2.1, $(FRAMEWORK_VERSION))
+ifeq (moonlight_raw, $(PROFILE))
 LIB_MCS_FLAGS += /r:System.Net
 endif
 
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+LIB_MCS_FLAGS += /r:System.Web.ApplicationServices.dll
+endif
+
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 TEST_EXTRA_FILES = \
        System.ServiceModel_test_net_3_0.dll.config \
        Test/config/* \
        Test/Resources/* \
-       Test/System.ServiceModel.Description/dump.xml
+       Test/XmlFiles/* \
+       Test/System.ServiceModel.Channels/soap-fault*.xml \
+       Test/System.ServiceModel.Channels/binary-message.raw \
+       Test/System.ServiceModel.Description/dump.xml \
+       Test/MetadataTests/Resources/*
 
 EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_EXTRA_FILES)
 
 # Useful for debugging under Visual Studio 2005
 # NO_SIGN_ASSEMBLY = yes
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ServiceModel.dll
 NO_INSTALL = yes