Merge pull request #444 from knocte/xbuild_improvements

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 17c95137b57ed367f4652afa7f9b88487bb4e439..a0f22d472876d4641f97855066511399551b91fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,32 +1,51 @@
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
-MOONLIGHT_SUBDIRS =    $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir)         data
+MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
 
 if CROSS_COMPILING
-SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) data runtime scripts man samples web msvc $(docs_dir)
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = po libgc eglib mono ikvm-native         data runtime scripts man samples web tools msvc docs
+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
 else
-SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc $(docs_dir)
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = po libgc eglib mono ikvm-native support data runtime scripts man samples web tools msvc docs
+DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 endif
 endif
 
-EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs autogen.sh 
+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 \
+           mono-core.spec \
+           external
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
 # Distribute the 'mcs' tree too
+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
 
 pkgconfigdir = $(libdir)/pkgconfig
 noinst_DATA = mono-uninstalled.pc
@@ -35,7 +54,8 @@ DISTCLEANFILES= mono-uninstalled.pc
 # building with monolite
 mcslib = $(mcs_topdir)/class/lib
 monolite = $(mcslib)/monolite
-monolite_url = http://mono.ximian.com/daily/monolite-latest.tar.gz
+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
 .PHONY: get-monolite-latest 
 get-monolite-latest:
        -rm -fr $(mcslib)/monolite-*
@@ -70,17 +90,26 @@ bootstrap-world: compiler-tests
 if MOONLIGHT
 moon-do-build: config.h
        @list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
-         echo "Making all in $$subdir"; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) all); \
+         case "x$$subdir" in \
+               xmono ) target="moon-do-build";; \
+               * ) target="all";; \
+         esac; \
+         echo "Making $$target in $$subdir"; \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
         done;
-       cd $(mcs_topdir) && NO_DIR_CHECK=1 $(MAKE) PROFILE=moonlight_raw all
+       (cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-build)
 
 moon-do-clean:
        @list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
-         echo "Making clean in $$subdir"; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean); \
+         case "x$$subdir" in \
+               xmono ) target="moon-do-clean";; \
+               * ) target="clean";; \
+         esac; \
+         echo "Making $$target in $$subdir"; \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
         done;
-       cd $(mcs_topdir) && NO_DIR_CHECK=1 $(MAKE) PROFILE=moonlight_raw clean
+       (cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-clean)
+
 endif
 
 win32getdeps:
@@ -122,6 +151,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