Last of the cycles is gone

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 96dea9c4d11236576d38640c21f117fae99cf8a3..560d02e717e02d461c5a0f16f3802405a3d4204c 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -104,15 +104,15 @@ net_2_0_dirs := \
        Mono.Tasklets                   \
        System.Dynamic                  \
        Mono.CSharp                     \
-       System.Net                              \
+       System.Net                      \
        System.Json
 
 net_2_0_only_dirs := \
        System.Web.Extensions_1.0       \
-       System.Web.Extensions.Design_1.0        \
+       System.Web.Extensions.Design_1.0\
        Compat.ICSharpCode.SharpZipLib  \
        WindowsBase                     \
-       System.ServiceModel.Web \
+       System.ServiceModel.Web         \
        System.Data.Services.Client     \
        System.Data.Services            \
        System.Web.Mvc \

diff --git a/mcs/class/System.ServiceModel.Activation/Makefile b/mcs/class/System.ServiceModel.Activation/Makefile
index a465c75d9e75e7e692729a80e677a3cd050103ef..0b0f338f4121498b4606922a5d9fbcdf2fe4b955 100644 (file)
--- a/mcs/class/System.ServiceModel.Activation/Makefile
+++ b/mcs/class/System.ServiceModel.Activation/Makefile
@@ -8,4 +8,15 @@ LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll -r:System.ServiceModel.dll
 
 TEST_MCS_FLAGS = -r:System.dll -r:System.Core.dll
 
+plainservicemodel_dir = $(the_libdir_base)plainservice
+servicemodel = $(plainservicemodel_dir)/System.ServiceModel.dll
+LOCAL_MCS_FLAGS = -lib:$(plainservicemodel_dir)
+
 include ../../build/library.make
+
+$(the_libdir_base)$(LIBRARY): $(servicemodel)
+
+$(servicemodel): 
+       (cd ../System.ServiceModel; $(MAKE) $@)
+
+.NOTPARALLEL: $(servicemodel)
\ No newline at end of file

diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile
index fd9d297b95acc80c5e237d74ce71e7335c54caa4..d64fefde16b1aed506c01430baee939315d3a74d 100755 (executable)
--- a/mcs/class/System.ServiceModel/Makefile
+++ b/mcs/class/System.ServiceModel/Makefile
@@ -7,7 +7,6 @@ RESOURCE_FILES = \
        resources/ws-addr.xsd
 
 LIBRARY = System.ServiceModel.dll
-LIBRARY_USE_INTERMEDIATE_FILE = yes
 
 LIB_MCS_FLAGS = \
                /nowarn:414,169,67,3005,436,219,618 \
@@ -34,32 +33,16 @@ LIB_MCS_FLAGS += /d:NET_3_0         \
 endif
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
-
-ACTIVATION_DEP := System.ServiceModel.Activation.dll
-ACTIVATION_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(ACTIVATION_DEP))
-CYCLIC_DEPS += $(ACTIVATION_DEP)
-CYCLIC_DEP_FILES += $(ACTIVATION_DEP_FILE)
-
-ifdef ACTIVATION_DEP_FILE
-LIB_MCS_FLAGS += -define:HAS_ACTIVATION -r:$(ACTIVATION_DEP)
-endif
-
 LIB_MCS_FLAGS += /r:System.Web.ApplicationServices.dll
+activation = $(the_libdir_base)System.ServiceModel.Activation.dll
+servicemodel_deps = $(activation)
 
-ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
-NO_SIGN_ASSEMBLY = yes
-NO_INSTALL = yes
-all-local: echo-warning
-.PHONY: echo-warning
-
-ifeq   (, $(strip $(CYCLIC_DEP_FILES)))
-echo-warning:
-       @echo "** Warning: System.ServiceModel.dll built without parts that depend on: $(CYCLIC_DEPS)"
+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
-
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 TEST_EXTRA_FILES = \
@@ -87,6 +70,16 @@ endif
 
 include ../../build/library.make
 
-ifdef ACTIVATION_DEP_FILE
-$(build_lib): $(CYCLIC_DEP_FILES)
+$(the_libdir_base)System.ServiceModel.dll: $(servicemodel_deps)
+
+$(activation):
+       (cd ../System.ServiceModel.Activation; $(MAKE) $@)
+
+ifneq (plainservice/,$(intermediate))
+$(the_libdir_base)plainservice/System.ServiceModel.dll:
+       $(MAKE) intermediate=plainservice/ $(the_libdir_base)plainservice/System.ServiceModel.dll
 endif
+
+.NOTPARALLEL: $(servicemodel_deps)
+
+CLEAN_FILES = $(the_libdir_base)plainservice/System.ServiceModel.dll
\ No newline at end of file