2004-11-30 Rafael Teixeira <rafaelteixeirabr@hotmail.com>

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 17cea8a64041ffd98d6b4ae7af369827b62b3c2b..68155a883872ee0211342b060cda0225e7885161 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data scripts man samples support web 
+SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web 
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono ikvm-jni docs data scripts man samples support web tools
+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
 
@@ -25,14 +25,17 @@ DISTCLEANFILES= mono.pc mint.pc
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
 # building with monolite
-monolitedir = $(mcs_topdir)/class/lib/basic
+mcsclassdir = $(mcs_topdir)/class
+monolitedir = $(mcsclassdir)/lib/basic
 get-monolite-latest:
-       wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz
-       -rm -f $(monolitedir)/mcs.exe $(monolitedir)/*.dll
-       -rm -fr $(monolitedir)//monolite-*
-       srcdir=`cd $(srcdir) && pwd` && cd $(monolitedir) && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - )
-       mv -f $(monolitedir)/monolite-*/mcs.exe $(monolitedir)/monolite-*/*.dll $(monolitedir)
+       -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
@@ -66,5 +69,5 @@ 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"
+       @echo "*** 'make bootstrap' is obsolete.  Just run 'make' to perform a combined mono+mcs build"
        exit 1