projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New test + update.
[mono.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 49c871120a66d605c05d05363f565f33c304dfb8..587ed44b1f4e89c3a36c645b500fbc39f42dc5fa 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-9,7
+9,9
@@
DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samp
vs_files = genmdesc.vcproj libmono.vcproj mono.vcproj mono.sln
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 $(vs_files)
+
+DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
# Distribute the 'mcs' tree too
dist-hook:
# Distribute the 'mcs' tree too
dist-hook:
@@
-18,12
+20,16
@@
dist-hook:
pkgconfigdir = $(libdir)/pkgconfig
if JIT_SUPPORTED
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
else
-pkgconfig_DATA= mint.pc
+pkgconfig_DATA= mint.pc
mono-cairo.pc
endif
noinst_DATA = mono-uninstalled.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
.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
@@
-42,8
+48,11
@@
compiler-tests: mcs-do-clean
$(MAKE) mcs-do-compiler-tests
compiler-tests-net_2_0:
$(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
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
$(MAKE) all
$(MAKE) build_profiles=net_2_0 mcs-do-compiler-tests
@@
-56,8
+65,10
@@
bootstrap-world-net_2_0: compiler-tests-net_2_0
# internal targets
mcs-do-clean:
cd runtime && $(MAKE) clean-local
# 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
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
win32getdeps:
wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip