X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=dfb63743bd3cdb74f394ceb503ac2a84b12cb20b;hb=813a2abba58e7fd83fec2d19056fb386c909725d;hp=164f178132fead3dd4c10297511f4d84fb2d99a1;hpb=a883b630bfe06753c768c7a2fe0304575eebc21e;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 164f178132f..dfb63743bd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 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 ikvm-native support docs data runtime scripts man samples web tools 
 
-EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
+EXTRA_DIST= mono.pc.in mint.pc.in
 
 # Distribute the 'mcs' tree too
 dist-hook:
@@ -25,29 +25,36 @@ 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
-	$(MAKE)
+compiler-tests: mcs-do-clean
+	$(MAKE) all
 	$(MAKE) mcs-do-compiler-tests
 
+compiler-tests-net_2_0:
+	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0_bootstrap clean
+	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 clean
+	$(MAKE) all
+	$(MAKE) build_profiles=net_2_0 mcs-do-compiler-tests
+
 bootstrap-world: compiler-tests
 	$(MAKE) install
 
+bootstrap-world-net_2_0: compiler-tests-net_2_0
+	$(MAKE) install
+
 # internal targets
+mcs-do-clean:
+	cd runtime && $(MAKE) clean-local
 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
@@ -56,14 +63,12 @@ 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:
 	makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi