X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=d48ca3110e8e7693c7110ccce764547772724328;hb=459aee6ee492c15d7a6bd8365ec8632f251243a4;hp=b90fd6741967e1218550ed9fc46f3b1884643ce2;hpb=ea16844828fef565d0cad331f1febe6452ca68ac;p=mono.git diff --git a/Makefile.am b/Makefile.am index b90fd674196..d48ca3110e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,21 +1,19 @@ ACLOCAL_AMFLAGS = -I m4 -MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono +AM_CFLAGS = $(WERROR_CFLAGS) + +MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono if CROSS_COMPILING -SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir) +SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests # Keep in sync with SUBDIRS ## 'tools' is not normally built -DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs -else -if ONLY_MOONLIGHT -SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime +DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests else -SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) +SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests # Keep in sync with SUBDIRS ## 'tools' is not normally built -DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs -endif +DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests endif all: update_submodules @@ -27,14 +25,14 @@ update_submodules: .PHONY: update_submodules EXTRA_DIST= \ - LICENSE \ - autogen.sh \ - build-mingw32.sh \ - mkinstalldirs \ - mono-uninstalled.pc.in \ - winconfig.h \ - mono-core.spec \ - external + README.md \ + LICENSE \ + autogen.sh \ + mkinstalldirs \ + mono-uninstalled.pc.in \ + winconfig.h \ + code_of_conduct.md \ + external DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false @@ -43,7 +41,11 @@ GIT_DIR ?= $(srcdir)/.git dist-hook: test -d $(distdir)/mcs || mkdir $(distdir)/mcs d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive - rm -rf `find $(top_distdir)/external -path '*\.git' -and -type d` + rm -rf `find $(top_distdir)/external -path '*\.git'` + rm -f `find $(top_distdir)/external -path '*\.exe'` + rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*'` + cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/ + cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/ # Disable this for now because it is very slow and causes wrench to timeout: # test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry @@ -55,7 +57,7 @@ DISTCLEANFILES= mono-uninstalled.pc mcslib = $(mcs_topdir)/class/lib monolite = $(mcslib)/monolite mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c) -monolite_url = http://storage.bos.xamarin.com/mono-dist-master/latest/monolite-$(mono_corlib_version)-latest.tar.gz +monolite_url = http://download.mono-project.com/monolite/monolite-$(mono_corlib_version)-latest.tar.gz .PHONY: get-monolite-latest get-monolite-latest: -rm -fr $(mcslib)/monolite-* @@ -87,28 +89,28 @@ mcs-do-compiler-tests: bootstrap-world: compiler-tests $(MAKE) install -if MOONLIGHT -moon-do-build: config.h - @list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \ +if INSTALL_MONOTOUCH +monotouch-do-build: config.h + @list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \ case "x$$subdir" in \ - xmono ) target="moon-do-build";; \ + xmono ) target="monotouch-do-build";; \ * ) target="all";; \ esac; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ done; - (cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-build) + (cd runtime && $(MAKE) $(AM_MAKEFLAGS) monotouch-do-build) -moon-do-clean: - @list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \ +monotouch-do-clean: + @list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \ case "x$$subdir" in \ - xmono ) target="moon-do-clean";; \ + xmono ) target="monotouch-do-clean";; \ * ) target="clean";; \ esac; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ done; - (cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-clean) + (cd runtime && $(MAKE) $(AM_MAKEFLAGS) monotouch-do-clean) endif @@ -131,6 +133,8 @@ win32setup: update-csproj: -rm msvc/scripts/order + -rm msvc/scripts/order.xml + -rm -rf msvc/scripts/inputs -mkdir msvc/scripts/inputs (cd runtime; make V=1 extra_targets=csproj-local) @@ -139,16 +143,23 @@ package-inputs: echo '' >> msvc/scripts/order.xml for i in `cat msvc/scripts/order`; do \ set `echo $$i | sed -e 's/:/ /' -e 's/.input//'`; \ - cat msvc/scripts/inputs/$$2.input | \ + cat msvc/scripts/inputs/$$2.input | sed -e 's/\\\\/\\/g' -e 's/\\/\\\\/g' | \ (echo " "; \ read boot; echo " $$boot"; \ - read mcs; echo " $$mcs"; \ read flags; echo " $$flags"; \ read output; echo " $$output"; \ - read built; echo " $$built"; \ + read built; echo " `echo $$built | sed 's/\\\/\\\\/g'`"; \ read libou; echo " $$libou"; \ read fx_ver; echo " $$fx_ver"; \ + read profile; echo " $$profile"; \ read resp; echo " $$resp"; \ - echo " ") >> msvc/scripts/order.xml; \ + echo " ") >> msvc/scripts/order.xml; \ done echo "" >> msvc/scripts/order.xml + +# Update llvm version in configure.ac to the output of $LLVM_DIR/bin/llvm-config --version +update-llvm-version: + if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi + REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV." + +