Another fix and unit test added.

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b99259a2f8b67dacfcafb7fe4bc316411fac83b..eef2c3800e13d7ee5d8401d60ca5aa125c01f0fc 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,7 +43,8 @@ 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
-       test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
+# 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
 
 pkgconfigdir = $(libdir)/pkgconfig
 noinst_DATA = mono-uninstalled.pc
@@ -139,6 +150,7 @@ package-inputs:
                 read output; echo "      <output>$$output</output>"; \
                 read built;  echo "      <built_sources>$$built</built_sources>"; \
                 read libou;  echo "      <library_output>$$libou</library_output>"; \
+                read fx_ver; echo "      <fx_version>$$fx_ver</fx_version>"; \
                 read resp;   echo "      <response>$$resp</response>"; \
                echo "    </project>") >> msvc/scripts/order.xml; \
        done