X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=12af7d609bc94bdbd6019e72e12a830f269360d2;hb=e102a86a57e5ea2e22b72a19f934fcd69f7df81a;hp=2e992141553dc6a8d291fc04cbf88e0d67491b73;hpb=0649b90c407fc29ee8377f2c6fb42ae2c006e26a;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 2e992141553..12af7d609bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,15 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web 
+SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools 
+DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools msvc
 
-vs_files = genmdesc.vcproj libmono.vcproj mono.vcproj mono.sln
+EXTRA_DIST= mono-uninstalled.pc.in LICENSE
 
-EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in dotnet.pc.in $(vs_files)
+DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
 # Distribute the 'mcs' tree too
 dist-hook:
@@ -17,24 +17,20 @@ dist-hook:
 	d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive
 
 pkgconfigdir = $(libdir)/pkgconfig
-if JIT_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc
-else
-pkgconfig_DATA= mint.pc
-endif
 noinst_DATA = mono-uninstalled.pc
-DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc dotnet.pc
+DISTCLEANFILES= mono-uninstalled.pc
 
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
 # building with monolite
 mcslib = $(mcs_topdir)/class/lib
 monolite = $(mcslib)/monolite
+monolite_url = http://mono.ximian.com/daily/monolite-latest.tar.gz
 get-monolite-latest:
 	-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) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
 	cd $(mcslib) && mv -f monolite-* monolite
 
 compiler-tests: mcs-do-clean
@@ -42,8 +38,11 @@ compiler-tests: mcs-do-clean
 	$(MAKE) mcs-do-compiler-tests
 
 compiler-tests-net_2_0:
+	-rm -f $(mcs_topdir)/build/common/Consts.cs.save
+	-mv -f $(mcs_topdir)/build/common/Consts.cs $(mcs_topdir)/build/common/Consts.cs.save
 	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0_bootstrap clean
 	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 clean
+	-mv -f $(mcs_topdir)/build/common/Consts.cs.save $(mcs_topdir)/build/common/Consts.cs
 	$(MAKE) all
 	$(MAKE) build_profiles=net_2_0 mcs-do-compiler-tests
 
@@ -56,8 +55,10 @@ bootstrap-world-net_2_0: compiler-tests-net_2_0
 # internal targets
 mcs-do-clean:
 	cd runtime && $(MAKE) clean-local
+	cd mono/tests && $(MAKE) clean
 mcs-do-compiler-tests:
 	cd runtime && $(MAKE) test_select='TEST_SUBDIRS="tests errors"' check-local
+	cd mono/tests && $(MAKE) check
 
 win32getdeps:
 	wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip