X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=b415a5c15922ad3d24d4d1ea17b9a0d333874f4b;hb=c1190d46529a93449ad915b0a0f341a484ff4048;hp=dfb63743bd3cdb74f394ceb503ac2a84b12cb20b;hpb=e5322d645c9e27e0ee9b967a3197b95b7ddc9bf5;p=mono.git diff --git a/Makefile.am b/Makefile.am index dfb63743bd3..b415a5c1592 100644 --- 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 $(vs_files) + +DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false # Distribute the 'mcs' tree too dist-hook: @@ -16,11 +20,12 @@ dist-hook: pkgconfigdir = $(libdir)/pkgconfig if JIT_SUPPORTED -pkgconfig_DATA= mono.pc mint.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 -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 +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