X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=a533344a76cdf090a72054c826ae79ccf5d9933e;hb=107e44e461ae22e5fcee195146d753d8e59e8bc8;hp=6d3780e593115fad2ef84232c0bc2b33e387d6ef;hpb=c251b192a55c255f278c9b9ad2ec949264a36526;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 6d3780e5931..a533344a76c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
+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)
@@ -8,6 +9,9 @@ SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man
 ## '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_MONOTOUCH
+SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
+else
 if ONLY_MOONLIGHT
 SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
 else
@@ -17,6 +21,15 @@ SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scr
 DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 endif
 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 \
@@ -24,7 +37,9 @@ EXTRA_DIST= \
 	    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 +48,9 @@ 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
+	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
@@ -43,7 +60,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-*
@@ -100,6 +117,31 @@ moon-do-clean:
 
 endif
 
+if INSTALL_MONOTOUCH
+monotouch-do-build: config.h
+	@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
+	  case "x$$subdir" in \
+		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) monotouch-do-build)
+
+monotouch-do-clean:
+	@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
+	  case "x$$subdir" in \
+		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) monotouch-do-clean)
+
+endif
+
 win32getdeps:
 	wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
 	wget http://www.go-mono.com/archive/glib-2.0.4-20020703.zip 
@@ -117,10 +159,6 @@ win32getdeps:
 win32setup:
 	makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
 
-patch-quiet:
-	find mono -name Makefile -exec scripts/patch-quiet.sh {} \;
-	find libgc -name Makefile -exec scripts/patch-quiet.sh {} \;
-
 update-csproj:
 	-rm msvc/scripts/order 
 	-mkdir msvc/scripts/inputs