**** Merged r36954 from MCS ****

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7ee17e886578d26e70dbecedfe72da11aaf7f417..164f178132fead3dd4c10297511f4d84fb2d99a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,19 @@
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = @libgc_dir@ mono @ikvm_jni_dir@ docs runtime scripts man data samples support web
+SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web 
 
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = libgc mono ikvm-jni docs runtime scripts man data samples support web
-
-# EXTRA_SUBDIRS = libgc
+## 'tools' is not normally built
+DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support web tools
 
 EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
 
+# Distribute the 'mcs' tree too
+dist-hook:
+       test -d $(distdir)/mcs || mkdir $(distdir)/mcs
+       d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive
+
 pkgconfigdir = $(libdir)/pkgconfig
 if JIT_SUPPORTED
 pkgconfig_DATA= mono.pc mint.pc
@@ -17,37 +22,32 @@ pkgconfig_DATA= mint.pc
 endif
 DISTCLEANFILES= mono.pc mint.pc
 
-#
-# The following target is used to compile and install
-# mono and mcs without running into the out-of-sync
-# problems by doing the compilation in the right order.
-#
-
-mcs_topdir=$(top_srcdir)/../mcs
-
-.PHONY: fullbuild remove-binaries mcs-tree-safe-build xinstall-runtime mcs-rest
-
-fullbuild: mcs-rest
+.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
+
+# building with monolite
+mcsclassdir = $(mcs_topdir)/class
+monolitedir = $(mcsclassdir)/lib/basic
+get-monolite-latest:
+       -rm -f $(monolitedir)/*.exe $(monolitedir)/*.dll
+       -rm -fr $(monolitedir)/monolite-*
+       cd $(monolitedir) && { wget -O- http://www.go-mono.com/daily/monolite-latest.tar.gz | gzip -d | tar xf - ; }
+       mv -f $(monolitedir)/monolite-*/*.exe $(monolitedir)/monolite-*/*.dll $(monolitedir)
+       rm -fr $(monolitedir)/monolite-*
+       cd $(mcsclassdir)/lib && { test ! -f basic.tar.gz || mv -f basic.tar.gz basic.tar.gz.old; }
+       cd $(mcsclassdir) && $(MAKE) lib/basic.tar.gz
+       -rm -f $(monolitedir)/*.exe $(monolitedir)/*.dll
+
+compiler-tests:
+       cd runtime && $(MAKE) clean-local
+       $(MAKE)
+       $(MAKE) mcs-do-compiler-tests
+
+bootstrap-world: compiler-tests
        $(MAKE) install
 
-mcs-tree-safe-build: remove-binaries
-       cd $(mcs_topdir)/jay; $(MAKE)
-       cd $(mcs_topdir)/mcs; $(MAKE) MCS=mcs BOOTSTRAP_MCS=mcs
-       cd $(mcs_topdir)/class/corlib; $(MAKE) MCS=mcs BOOTqSTRAP_MCS=mcs
-       cp $(mcs_topdir)/class/lib/mscorlib.dll $(top_srcdir)/runtime
-       cp $(mcs_topdir)/mcs/mcs.exe $(top_srcdir)/runtime
-
-xinstall-runtime: mcs-tree-safe-build
-       if test -z "$(libgc_dir)"; then :; else cd libgc; $(MAKE) && $(MAKE) install ; fi
-       cd mono; $(MAKE) && $(MAKE) install
-       cd runtime; $(MAKE) install assemblies_DATA=mscorlib.dll monobins_DATA=mcs.exe
-
-mcs-rest: xinstall-runtime
-       cd $(mcs_topdir)/class; $(MAKE)
-
-remove-binaries:
-       rm -f $(mcs_topdir)/class/lib/mscorlib.dll $(mcs_topdir)/mcs/mcs.exe $(top_srcdir)/runtime/*.dll $(top_srcdir)/runtime/*.exe
-
+# internal targets
+mcs-do-compiler-tests:
+       cd runtime && $(MAKE) TEST_SUBDIRS="tests errors" check-local
 
 win32getdeps:
        wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
@@ -66,10 +66,8 @@ win32getdeps:
        unzip -n -d / nsis4cygwin.zip
 
 win32setup:
-       cp /usr/lib/libglib-2.0-0.dll @prefix@/lib
-       cp /usr/lib/iconv.dll @prefix@/lib
-       cp /usr/lib/libgmodule-2.0-0.dll @prefix@/lib
-       cp /usr/lib/libgobject-2.0-0.dll @prefix@/lib
-       cp /usr/lib/libgthread-2.0-0.dll @prefix@/lib
-       cp /usr/lib/libintl-1.dll @prefix@/lib
-       makensis /DMILESTONE=@VERSION@ /DSOURCE_INSTALL_DIR=`cygpath -a -w @prefix@`\\* monowiz.win32.nsi
+       makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
+
+bootstrap: all
+       @echo "*** 'make bootstrap' is obsolete.  Just run 'make' to perform a combined mono+mcs build"
+       exit 1