X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=f65f91f6bd54dc4dcb40eb6a8ccb00e9fa376e79;hb=8cfe56d80c6dc0f07600be712c0daaf1cd2eb2da;hp=b4b49b097154ce09317eac17e6d24adf4fd2f8e3;hpb=6f94553690b1cd6487bcc206aec7f58c99f77adb;p=mono.git

diff --git a/mcs/Makefile b/mcs/Makefile
index b4b49b09715..f65f91f6bd5 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,15 +1,17 @@
 thisdir := .
 
-SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
+SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
+
+# Resgen is corlib specific tool
 
 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
-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
+build_SUBDIRS := build class mcs class/aot-compiler tools
+net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors
+moonlight_raw_SUBDIRS := build class
+monodroid_SUBDIRS := build class
+monotouch_SUBDIRS := build class
+net_3_5_SUBDIRS := build class tools/xbuild
+net_4_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
 
 # List of test subdirs that should pass 100%
 centum_tests := \
@@ -21,11 +23,14 @@ centum_tests := \
 	class/Microsoft.JScript					\
 	class/Mono.Posix					\
 	class/Mono.Security					\
-	class/System.Messaging					\
+	class/System.Design					\
+	class/System.DirectoryServices		\
+	class/System.Drawing				\
 	class/System.Runtime.Remoting				\
 	class/System.Runtime.Serialization.Formatters.Soap	\
 	class/System.Security					\
 	class/System.ServiceProcess				\
+	class/System.Web						\
 	class/System.Web.Services				\
 	tests							\
 	errors
@@ -38,17 +43,24 @@ net_2_0_centum_tests := \
 	$(centum_tests)				\
 	class/System.Core			\
 	class/System.Configuration		\
+	class/System.Data.DataSetExtensions	\
 	class/System.Xml.Linq			\
+	class/System.Transactions		\
 	class/Microsoft.Build.Framework		\
 	class/Microsoft.Build.Utilities		\
-	class/Microsoft.Build.Engine
-#class/Microsoft.Build.Tasks	
-#class/Mono.C5
+	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
+#	class/Microsoft.Build.Tasks	
 
 # note that System.Xml.Linq is here to prevent this from being empty
 net_3_5_centum_tests := \
 	class/System.Xml.Linq
-#class/System.Web.Extensions		
 
 ifdef ONLY_CENTUM_TESTS
 TEST_SUBDIRS := $($(PROFILE)_centum_tests)
@@ -67,11 +79,11 @@ all-local $(STD_TARGETS:=-local):
 	@:
 
 dir-check:
-	@if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then echo "Running make from the mcs directory is not supported. Run make from the parent directory (if using a tarball), or from the directory where the runtime is checked out (if using an SVN checkout)."; exit 1; fi
+	@if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then echo "Running make from the mcs directory is not supported. Run make from the parent directory."; exit 1; fi
 
 # fun specialty targets
 
-PROFILES = default 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--%
@@ -90,14 +102,14 @@ 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--build--%
 $(_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--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--default--%
-$(_boot_:%=profile-do--default--%):           profile-do--default--%:           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--moonlight--%):         profile-do--moonlight--%:         profile-do--moonlight_raw--%
+$(_boot_:%=profile-do--monodroid--%):         profile-do--monodroid--%:         profile-do--build--%
+$(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--build--%
+$(_boot_:%=profile-do--moonlight_raw--%):     profile-do--moonlight_raw--%:
+$(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--build--%
+$(_boot_:%=profile-do--build--%):             profile-do--build--%:             profile-do--basic--%
 
 testcorlib:
 	@cd class/corlib && $(MAKE) test run-test
@@ -105,10 +117,6 @@ testcorlib:
 compiler-tests:
 	$(MAKE) TEST_SUBDIRS="tests errors" run-test-profiles
 
-test-installed-compiler:
-	$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=default 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 = \
@@ -127,11 +135,12 @@ DISTFILES = \
 	MonoIcon.png		\
 	README			\
 	ScalableMonoIcon.svg	\
-	winexe.in		\
-	nunit.key
+	winexe.in
 
 dist-local: dist-default
 
+csproj-local:
+
 dist-pre:
 	rm -rf $(package)
 	mkdir $(package)