Merge pull request #444 from knocte/xbuild_improvements

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 74f28ed2bcf78a4a5485cdde201508d73eb4c1cf..a0f22d472876d4641f97855066511399551b91fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,13 +18,23 @@ DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts m
 endif
 endif
 
+all: update_submodules
+
+SUBMODULE_ERROR='Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date'
+update_submodules:
+       @$(srcdir)/scripts/update_submodules
+
+.PHONY: update_submodules
+
 EXTRA_DIST= \
            LICENSE \
            autogen.sh \
            build-mingw32.sh \
            mkinstalldirs \
            mono-uninstalled.pc.in \
-           winconfig.h
+           winconfig.h \
+           mono-core.spec \
+           external
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
@@ -33,6 +43,7 @@ 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`
 # 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
 
@@ -44,7 +55,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://mono.ximian.com/daily/monolite-$(mono_corlib_version)-latest.tar.gz
+monolite_url = http://storage.bos.xamarin.com/mono-dist-master/latest/monolite-$(mono_corlib_version)-latest.tar.gz
 .PHONY: get-monolite-latest 
 get-monolite-latest:
        -rm -fr $(mcslib)/monolite-*