Improve

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dfb63743bd3cdb74f394ceb503ac2a84b12cb20b..587ed44b1f4e89c3a36c645b500fbc39f42dc5fa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,11 @@ SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts
 ## 'tools' is not normally built
 DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools 
 
-EXTRA_DIST= mono.pc.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 dotnet.pc.in mono-cairo.pc.in LICENSE $(vs_files)
+
+DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
 # Distribute the 'mcs' tree too
 dist-hook:
@@ -16,11 +20,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= mono.pc dotnet.pc mono-cairo.pc
+endif
 else
-pkgconfig_DATA= mint.pc
+pkgconfig_DATA= mint.pc mono-cairo.pc
 endif
-DISTCLEANFILES= mono.pc mint.pc
+noinst_DATA = mono-uninstalled.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
 
@@ -39,8 +48,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
 
@@ -53,8 +65,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