X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.ServiceModel%2FMakefile;h=03dbd5fd9e59d7fd8b5b225e7ed63040f22fc059;hb=9f6dc46ae38140a6961e71292499fe2079cde75b;hp=fe7f16e54eb81e4a5e440802d20637281510730d;hpb=62cc262196951b67a13069444b889dc71758776c;p=mono.git diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile old mode 100755 new mode 100644 index fe7f16e54eb..03dbd5fd9e5 --- a/mcs/class/System.ServiceModel/Makefile +++ b/mcs/class/System.ServiceModel/Makefile @@ -8,41 +8,44 @@ RESOURCE_FILES = \ LIBRARY = System.ServiceModel.dll +LIB_REFS = System System.Xml System.Core System.Runtime.Serialization 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_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_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_MCS_FLAGS += -define:HAS_ACTIVATION -r:System.ServiceModel.Activation.dll -LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll -endif +endif +endif # NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY + +ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY +LIB_REFS += System.Web.ApplicationServices endif +endif # (4, $(FRAMEWORK_VERSION_MAJOR)) + +endif # (2.1, $(FRAMEWORK_VERSION)) + TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) TEST_EXTRA_FILES = \ @@ -87,4 +90,4 @@ CLEAN_FILES = $(the_libdir_base)plainservice/System.ServiceModel.dll ifndef intermediate csproj-local: $(MAKE) csproj-local intermediate=plainservice/ -endif \ No newline at end of file +endif