X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=ace9b2dca35a9d961b5b9f501c878f3e6f29eaf8;hb=60a179c054a9708bc12852a27a99ce73240a942a;hp=99b06c65e98d04b3f4b1dcf895d121a8688c147c;hpb=b204672ea04ed59706d584edc8540ec5db1e4a9b;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 99b06c65e98..ace9b2dca35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs
+SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc $(docs_dir)
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
@@ -14,8 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 # Distribute the 'mcs' tree too
 dist-hook:
 	test -d $(distdir)/mcs || mkdir $(distdir)/mcs
-	d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=net_1_1 distdir=$$d dist-recursive
-	d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 distdir=$$d dist-recursive
+	d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
 
 pkgconfigdir = $(libdir)/pkgconfig
 noinst_DATA = mono-uninstalled.pc
@@ -35,9 +34,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 +43,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 +52,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