X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=3c04be99c3d083b017afd505be89e47c9648e85a;hb=06d4fb790e05702fa207f1db6c4b311c5692a11e;hp=2a0fa2fb5225f1c8a1ed8e3d310835d0c2710cd2;hpb=2d557adc183ed6160d0b56847629e5b2d80abde4;p=mono.git

diff --git a/mcs/Makefile b/mcs/Makefile
index 2a0fa2fb522..3c04be99c3d 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,15 +1,18 @@
 thisdir := .
 
-SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
-
-basic_SUBDIRS := build jay mcs class
-net_1_1_bootstrap_SUBDIRS := build jay mcs class ilasm tools
-net_2_0_bootstrap_SUBDIRS := build jay mcs class ilasm tools
-net_2_0_SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
-net_2_1_bootstrap_SUBDIRS := build mcs class
-net_2_1_raw_SUBDIRS := build mcs class tools
-net_2_1_SUBDIRS := tools tests errors
-net_3_5_SUBDIRS := build class
+SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
+
+basic_SUBDIRS := build jay mcs class tools
+net_2_0_bootstrap_SUBDIRS := build tools
+net_2_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors 
+moonlight_bootstrap_SUBDIRS := build mcs class
+moonlight_raw_SUBDIRS := build mcs class tools
+moonlight_SUBDIRS := tools tests errors
+monotouch_SUBDIRS := build mcs class
+monotouch_bootstrap_SUBDIRS := build mcs class
+net_3_5_SUBDIRS := build class tools/xbuild
+net_4_0_bootstrap_SUBDIRS := build mcs class tools 
+net_4_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
 
 # List of test subdirs that should pass 100%
 centum_tests := \
@@ -24,7 +27,6 @@ centum_tests := \
 	class/System.Design					\
 	class/System.DirectoryServices		\
 	class/System.Drawing				\
-	class/System.Messaging					\
 	class/System.Runtime.Remoting				\
 	class/System.Runtime.Serialization.Formatters.Soap	\
 	class/System.Security					\
@@ -48,6 +50,10 @@ net_2_0_centum_tests := \
 	class/Microsoft.Build.Framework		\
 	class/Microsoft.Build.Utilities		\
 	class/Microsoft.Build.Engine		\
+	class/System.Runtime.Serialization	\
+	class/System.IdentityModel		\
+	class/System.ServiceModel		\
+	class/System.ServiceModel.Web		\
 	class/Mono.C5
 
 #	class/System.Web.Extensions
@@ -78,7 +84,7 @@ dir-check:
 
 # fun specialty targets
 
-PROFILES = net_1_1 net_2_0 net_3_5
+PROFILES = net_2_0 net_3_5 net_4_0
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
 all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -97,14 +103,16 @@ profiles-do--run-test:
 
 # Orchestrate the bootstrap here.
 _boot_ = all clean install
+$(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--net_4_0_bootstrap--%
+$(_boot_:%=profile-do--net_4_0_bootstrap--%): profile-do--net_4_0_bootstrap--%: profile-do--net_2_0--%
 $(_boot_:%=profile-do--net_3_5--%):           profile-do--net_3_5--%:           profile-do--net_2_0--%
-$(_boot_:%=profile-do--net_2_1--%):           profile-do--net_2_1--%:           profile-do--net_2_1_raw--%
-$(_boot_:%=profile-do--net_2_1_raw--%):       profile-do--net_2_1_raw--%:       profile-do--net_2_1_bootstrap--%
-$(_boot_:%=profile-do--net_2_1_bootstrap--%): profile-do--net_2_1_bootstrap--%: profile-do--net_2_0--%
+$(_boot_:%=profile-do--moonlight--%):           profile-do--moonlight--%:           profile-do--moonlight_raw--%
+$(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--monotouch_bootstrap--%
+$(_boot_:%=profile-do--monotouch_bootstrap--%): profile-do--monotouch_bootstrap--%: profile-do--net_2_0--%
+$(_boot_:%=profile-do--moonlight_raw--%):       profile-do--moonlight_raw--%:       profile-do--moonlight_bootstrap--%
+$(_boot_:%=profile-do--moonlight_bootstrap--%): profile-do--moonlight_bootstrap--%: profile-do--basic--%
 $(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--net_2_0_bootstrap--%
-$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--net_1_1--%
-$(_boot_:%=profile-do--net_1_1--%):           profile-do--net_1_1--%:           profile-do--net_1_1_bootstrap--%
-$(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
+$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--basic--%
 
 testcorlib:
 	@cd class/corlib && $(MAKE) test run-test
@@ -112,10 +120,6 @@ testcorlib:
 compiler-tests:
 	$(MAKE) TEST_SUBDIRS="tests errors" run-test-profiles
 
-test-installed-compiler:
-	$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=net_1_1 TEST_RUNTIME=mono MCS=mcs run-test
-	$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=net_2_0 TEST_RUNTIME=mono MCS=gmcs run-test
-
 package := mcs-$(VERSION)
 
 DISTFILES = \
@@ -139,6 +143,8 @@ DISTFILES = \
 
 dist-local: dist-default
 
+csproj-local:
+
 dist-pre:
 	rm -rf $(package)
 	mkdir $(package)