[xbuild] Add new reserved properties $(MSBuildThisFile*).

[mono.git] / mcs / Makefile

diff --git a/mcs/Makefile b/mcs/Makefile
index 7ac1242c1e995ead9cdeda2c8485afd0a489665d..f65f91f6bd54dc4dcb40eb6a8ccb00e9fa376e79 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -2,17 +2,16 @@ thisdir := .
 
 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 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
-monotouch_SUBDIRS := build mcs class
-monotouch_bootstrap_SUBDIRS := build mcs class
-net_3_5_SUBDIRS := build class
-net_4_0_bootstrap_SUBDIRS := build mcs class tools
-net_4_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors
+# Resgen is corlib specific tool
+
+basic_SUBDIRS := build jay mcs 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 := \
@@ -80,7 +79,7 @@ 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
 
@@ -103,16 +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--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_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--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--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--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
@@ -138,8 +135,7 @@ DISTFILES = \
        MonoIcon.png            \
        README                  \
        ScalableMonoIcon.svg    \
-       winexe.in               \
-       nunit.key
+       winexe.in
 
 dist-local: dist-default