X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=b8e39136e15bd48bbe0cb8f7b3d582d86ce5f161;hb=3ff73d8d7d4c7b752bef2951ad167cc770ea772b;hp=17cea8a64041ffd98d6b4ae7af369827b62b3c2b;hpb=f8e1286560b2a7779e69bebc1e5c8ebdcd56837b;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 17cea8a6404..b8e39136e15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,20 @@
 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_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 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
+vs_files = genmdesc.vcproj libmono.vcproj mono.vcproj mono.sln
+
+EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in $(vs_files)
 
 # 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
@@ -20,31 +22,42 @@ pkgconfig_DATA= mono.pc mint.pc
 else
 pkgconfig_DATA= mint.pc
 endif
-DISTCLEANFILES= mono.pc mint.pc
+noinst_DATA = mono-uninstalled.pc
+DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.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-*
-
-compiler-tests:
-	cd runtime && $(MAKE) clean-local
-	$(MAKE)
+	-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: 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
@@ -53,18 +66,16 @@ 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
 
 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