2007-05-04 Rolf Bjarne Kvinge <RKvinge@novell.com>

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 11b8df364a6f0b4ba5108db23f8fca3da3dd04cc..539314ec62834bc004b3731c8e4fb91df5386a61 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,13 @@
 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 $(vs_files)
+EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in dotnet.pc.in mono-cairo.pc.in LICENSE
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
@@ -20,12 +18,16 @@ dist-hook:
 
 pkgconfigdir = $(libdir)/pkgconfig
 if JIT_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc dotnet.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
 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
 
@@ -61,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