X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=f9d77579b41f560d280765e96b3f945c4f309cfe;hb=3a9e0ee575cdcb3303c0fd69a209b968f97b9295;hp=a84025b9c798031c8359e5f005b562232b0cf0fd;hpb=293e9fe9a5c9c37f6b7b4947948add15452f4057;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index a84025b9c79..f9d77579b41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,41 +1,51 @@
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = @libgc_dir@ mono doc docs runtime scripts man data samples
+SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web 
 
-# EXTRA_SUBDIRS = libgc
+# Keep in sync with SUBDIRS
+## '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
+else
+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.
-#
-
-fullbuild: remove-binaries mcs-tree-safe-build xinstall-runtime mcs-rest install
+.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
-mcs-tree-safe-build:
-	(cd ../mcs/jay; $(MAKE))
-	(cd ../mcs/mcs; $(MAKE) MCS=mcs BOOTSTRAP_MCS=mcs)
-	(cd ../mcs/class/corlib; $(MAKE) MCS=mcs BOOTSTRAP_MCS=mcs)
-	cp ../mcs/class/lib/mscorlib.dll runtime
-	cp ../mcs/mcs/mcs.exe runtime
+# 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
 
-xinstall-runtime:
-	if echo $(SUBDIRS) | grep "libgc " > /dev/null; then (cd libgc; $(MAKE) && $(MAKE) install); fi
-	(cd mono; $(MAKE) && $(MAKE) install)
-	(cd runtime; $(MAKE) install assemblies_DATA=mscorlib.dll monobins_DATA=mcs.exe)
+compiler-tests: mcs-do-clean
+	$(MAKE) all
+	$(MAKE) mcs-do-compiler-tests
 
-mcs-rest:
-	(cd ../mcs/class; $(MAKE))
-
-remove-binaries:
-	rm ../mcs/class/lib/mscorlib.dll ../mcs/mcs/mcs.exe runtime/*dll runtime/*.exe > /dev/null 2>&1; echo
+bootstrap-world: compiler-tests
+	$(MAKE) install
 
+# 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
@@ -44,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