X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=539314ec62834bc004b3731c8e4fb91df5386a61;hb=4909667ef8407cde06fe11372ed364bc74bc6512;hp=2e992141553dc6a8d291fc04cbf88e0d67491b73;hpb=089d5fed1917f774dfd602b2e3e4f5a60285a349;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 2e992141553..539314ec628 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.pc.in mint.pc.in mono-uninstalled.pc.in dotnet.pc.in mono-cairo.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:
@@ -18,12 +18,16 @@ dist-hook:
 
 pkgconfigdir = $(libdir)/pkgconfig
 if JIT_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc
+if INTERP_SUPPORTED
+pkgconfig_DATA= mono.pc mint.pc dotnet.pc mono-cairo.pc
 else
-pkgconfig_DATA= mint.pc
+pkgconfig_DATA= mono.pc dotnet.pc mono-cairo.pc
+endif
+else
+pkgconfig_DATA= mint.pc mono-cairo.pc
 endif
 noinst_DATA = mono-uninstalled.pc
-DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc dotnet.pc
+DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc dotnet.pc mono-cairo.pc
 
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
@@ -42,8 +46,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 +63,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