X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=68155a883872ee0211342b060cda0225e7885161;hb=52f48a0933de88188748bec54be8f2184dbe5b23;hp=1cda89ba8f42a490ec995865a8c6a787ba9d7bf0;hpb=cac115908ecc5d240243609dee89a01c4cfe3d52;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 1cda89ba8f4..68155a88387 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,73 @@
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = @libgc_dir@ mono doc docs runtime scripts man data
+SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web 
 
-dnl EXTRA_SUBDIRS = libgc
+# Keep in sync with SUBDIRS
+## '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
+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) distdir=$$d dist-recursive
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= mono.pc
-DISTCLEANFILES= mono.pc
+if JIT_SUPPORTED
+pkgconfig_DATA= mono.pc mint.pc
+else
+pkgconfig_DATA= mint.pc
+endif
+DISTCLEANFILES= mono.pc mint.pc
+
+.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
+
+# 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
+	wget http://www.go-mono.com/archive/glib-2.0.4-20020703.zip 
+	wget http://www.go-mono.com/archive/glib-dev-2.0.4-20020703.zip 
+	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:
+	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