2005-01-08 Geoff Norton <gnorton@customerdna.com>

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e71ff01df568627b29d9301c586a1551614a3a9c..c519486c3237a8111b0da44f5dd55323bf7a960e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,18 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data scripts man samples support web 
+SUBDIRS = $(libgc_dir) mono support docs data runtime scripts man samples 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 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) distdir=$$d dist-recursive
+       d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive
 
 pkgconfigdir = $(libdir)/pkgconfig
 if JIT_SUPPORTED
@@ -25,14 +25,14 @@ 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
+mcslib = $(mcs_topdir)/class/lib
+monolite = $(mcslib)/monolite
 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 -fr $(monolitedir)/monolite-*
+       -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
 
 compiler-tests:
        cd runtime && $(MAKE) clean-local
@@ -44,7 +44,7 @@ bootstrap-world: compiler-tests
 
 # internal targets
 mcs-do-compiler-tests:
-       cd runtime && $(MAKE) TEST_SUBDIRS="tests errors" check-local
+       cd runtime && $(MAKE) test_select='TEST_SUBDIRS="tests errors"' check-local
 
 win32getdeps:
        wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip