X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=f9d77579b41f560d280765e96b3f945c4f309cfe;hb=9f174ec6c0aa45201e98ec7953288a50c874fdb5;hp=5806aca8f275b466d9ffff58b0039c42192b2635;hpb=687ff89de328949c8bfa64bc3ba7501a8135fd82;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 5806aca8f27..f9d77579b41 100644
--- 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_native_dir) support docs data runtime scripts man samples 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-native support docs data runtime scripts man samples 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,39 +22,30 @@ 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.
-#
+.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
-mcs_topdir=$(top_srcdir)/../mcs
+# building with monolite
+mcslib = $(mcs_topdir)/class/lib
+monolite = $(mcslib)/monolite
+get-monolite-latest:
+	-rm -fr $(mcslib)/monolite-*
+	test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
+	test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
+	cd $(mcslib) && { wget -O- http://www.go-mono.com/daily/monolite-latest.tar.gz | gzip -d | tar xf - ; }
+	cd $(mcslib) && mv -f monolite-* monolite
 
-.PHONY: fullbuild remove-binaries mcs-tree-safe-build xinstall-runtime mcs-rest
+compiler-tests: mcs-do-clean
+	$(MAKE) all
+	$(MAKE) mcs-do-compiler-tests
 
-fullbuild: mcs-rest
-	$(MAKE)
+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 PROFILE=default
-	cd $(mcs_topdir)/class/corlib && $(MAKE) MCS=mcs BOOTSTRAP_MCS=mcs PROFILE=default
-	cp $(mcs_topdir)/class/lib/default/mscorlib.dll $(top_srcdir)/runtime/net_1_1
-	cp $(mcs_topdir)/mcs/mcs.exe $(top_srcdir)/runtime
-
-xinstall-runtime: mcs-tree-safe-build $(CONFIG_HEADER)
-	if test -z "$(libgc_dir)"; then :; else cd libgc && $(MAKE) && $(MAKE) install ; fi
-	cd mono && $(MAKE) && $(MAKE) install
-	cd runtime && $(MAKE) install SUBDIRS= monobins_DATA=mcs.exe
-	cd runtime/net_1_1 && $(MAKE) install assemblies_DATA=mscorlib.dll gac_assemblies_list=
-
-mcs-rest: xinstall-runtime
-	cd $(mcs_topdir) && $(MAKE)
-
-remove-binaries:
-	rm -f $(mcs_topdir)/class/lib/default/mscorlib.dll $(mcs_topdir)/mcs/mcs.exe $(top_srcdir)/runtime/*/*.dll $(top_srcdir)/runtime/*.exe
-
+# internal targets
+mcs-do-clean:
+	cd runtime && $(MAKE) clean-local
+mcs-do-compiler-tests:
+	cd runtime && $(MAKE) test_select='TEST_SUBDIRS="tests errors"' check-local
 
 win32getdeps:
 	wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
@@ -58,20 +54,16 @@ win32getdeps:
 	wget http://www.go-mono.com/archive/libiconv-1.7.zip 
 	wget http://www.go-mono.com/archive/libiconv-dev-1.7.zip 
 	wget http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip
-	wget http://www.jroith.de/nsis4cygwin.zip
 	unzip -n -d / pkgconfig-0.11-20020310.zip
 	unzip -n -d / glib-2.0.4-20020703.zip
 	unzip -n -d / glib-dev-2.0.4-20020703.zip
 	unzip -n -d / libiconv-1.7.zip
 	unzip -n -d / libiconv-dev-1.7.zip
 	unzip -n -d / libintl-0.10.40-20020101.zip
-	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