X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=b415a5c15922ad3d24d4d1ea17b9a0d333874f4b;hb=98283ccfbed4d774a459824df7e753a41a5eab1e;hp=49c871120a66d605c05d05363f565f33c304dfb8;hpb=d56758124087ba74bbf1fc7fd3028d2af570140d;p=mono.git diff --git a/Makefile.am b/Makefile.am index 49c871120a6..b415a5c1592 100644 --- 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 -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 $(vs_files) + +DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false # Distribute the 'mcs' tree too dist-hook: @@ -18,12 +20,12 @@ dist-hook: pkgconfigdir = $(libdir)/pkgconfig if JIT_SUPPORTED -pkgconfig_DATA= mono.pc mint.pc dotnet.pc +pkgconfig_DATA= mono.pc mint.pc dotnet.pc mono-cairo.pc 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 @@ -42,8 +44,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