2005-01-19 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 164f178132fead3dd4c10297511f4d84fb2d99a1..f98828c58faa3dd023a15d25361d261bee7093b0 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 runtime scripts man samples support web 
+SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) 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 runtime scripts man samples support web tools
+DIST_SUBDIRS = libgc mono docs data runtime scripts man samples ikvm-native support web tools
 
 EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
 
@@ -25,17 +25,14 @@ 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
+mcslib = $(mcs_topdir)/class/lib
+monolite = $(mcslib)/monolite
 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
+       -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
@@ -47,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