Break some circular dependencies between mono, mcs and moon

* Makefile.am (compiler-tests): Rewrite to re-build the moon
assemblies after mcs/ is built.
* runtime/Makefile.am (build_profiles) [INSTALL_2_1]: Build only
the net_2_1_raw profile.
(test_profiles): New.  Mention net_2_1 profile.
(moon-do-build): New.

svn path=/trunk/mono/; revision=133678

ChangeLog

@@ -1,3 +1,12 @@
+2009-05-06  Raja R Harinath  <[email protected]>
+
+	* Makefile.am (compiler-tests): Rewrite to re-build the moon
+	assemblies after mcs/ is built.
+	* runtime/Makefile.am (build_profiles) [INSTALL_2_1]: Build only
+	the net_2_1_raw profile.
+	(test_profiles): New.  Mention net_2_1 profile.
+	(moon-do-build): New.
+
 2009-05-05  Miguel de Icaza  <[email protected]>
 
 	* configure.in: Reduce configure-time dependencies by using

Makefile.am

@@ -35,9 +35,7 @@ get-monolite-latest:
 	cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
 	cd $(mcslib) && mv -f monolite-* monolite
 
-compiler-tests: mcs-do-clean
-	$(MAKE) all
-	$(MAKE) mcs-do-compiler-tests
+compiler-tests: build-test-mono-mcs-moon
 
 compiler-tests-net_2_0:
 	-rm -f $(mcs_topdir)/build/common/Consts.cs.save
@@ -46,7 +44,7 @@ compiler-tests-net_2_0:
 	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 clean
 	-mv -f $(mcs_topdir)/build/common/Consts.cs.save $(mcs_topdir)/build/common/Consts.cs
 	$(MAKE) all
-	$(MAKE) build_profiles=net_2_0 mcs-do-compiler-tests
+	$(MAKE) test_profiles=net_2_0 mcs-do-compiler-tests
 
 bootstrap-world: compiler-tests
 	$(MAKE) install
@@ -55,6 +53,18 @@ bootstrap-world-net_2_0: compiler-tests-net_2_0
 	$(MAKE) install
 
 # internal targets
+.PHONY: build-test-mono-mcs-moon
+build-test-mono-mcs-moon: do-build-moon-maybe
+	$(MAKE) mcs-do-compiler-tests
+
+.PHONY: do-build-mono-mcs
+do-build-mono-mcs: mcs-do-clean
+	$(MAKE) all
+
+.PHONY: do-build-moon-maybe
+do-build-moon-maybe: do-build-mono-mcs
+	cd runtime && $(MAKE) moon-do-build
+
 mcs-do-clean:
 	cd runtime && $(MAKE) clean-local
 	cd mono/tests && $(MAKE) clean

runtime/Makefile.am

@@ -21,12 +21,15 @@ SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
 if INSTALL_2_0
 if INSTALL_2_1
-build_profiles = net_1_1 net_2_0 net_3_5 net_2_1
+build_profiles = net_1_1 net_2_0 net_3_5 net_2_1_raw
+test_profiles = net_1_1 net_2_0 net_3_5 net_2_1
 else
 build_profiles = net_1_1 net_2_0 net_3_5
+test_profiles = $(build_profiles)
 endif
 else
 build_profiles = net_1_1
+test_profiles = $(build_profiles)
 endif
 
 if BUILD_MCS
@@ -68,11 +71,19 @@ else
 test_select = ONLY_CENTUM_TESTS=yes
 endif
 
+if INSTALL_2_1
+moon-do-build: test-support-files
+	cd $(top_builddir)/../moon/class && $(MAKE) all
+else
+moon-do-build:
+	@:
+endif
+
 mcs-do-test-profiles:
-	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' test-profiles
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
 
 mcs-do-run-test-profiles: test-support-files
-	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' run-test-profiles
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' run-test-profiles
 
 if PLATFORM_WIN32
 if CROSS_COMPILING
@@ -92,7 +103,7 @@ endif
 # Skip net 2.1 assemblies for now because of visibility problems
 mcs-compileall: mono-wrapper etc/mono/config
 	save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
-	for profile in $(build_profiles); do \
+	for profile in $(test_profiles); do \
 	  if [ "net_2_1" = "$$profile" ]; then \
           break; \
       fi; \