Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aaffb9842ba9dbe36090cead00afe0d1ebe1232d..12b27f14b08425ea15bae3ce0d3af13287c02368 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 AM_CFLAGS = $(WERROR_CFLAGS)
 
-MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
+MONOTOUCH_SUBDIRS = $(libgc_dir) mono
 
 # Some tools might not build when cross-compiling
 if CROSS_COMPILING
@@ -11,15 +11,15 @@ else
 tools_dir = tools
 endif
 
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
+SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
+DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
 
 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
+       @$(srcdir)/scripts/update_submodules.sh
 
 .PHONY: update_submodules
 
@@ -42,30 +42,17 @@ 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'`
-       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
+       rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
+       rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
 
 pkgconfigdir = $(libdir)/pkgconfig
 noinst_DATA = mono-uninstalled.pc
 DISTCLEANFILES= mono-uninstalled.pc
 
 # building with monolite
-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://download.mono-project.com/monolite/monolite-$(mono_corlib_version)-latest.tar.gz
 .PHONY: get-monolite-latest 
 get-monolite-latest:
-       -rm -fr $(mcslib)/monolite-*
-       -mkdir -p $(mcslib)
-       test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
-       test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
-       cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
-       cd $(mcslib) && mv -f monolite-* monolite
+       $(MAKE) -C $(mcs_topdir)/class get-monolite-latest
 
 if BITCODE
 BITCODE_CHECK=yes
@@ -122,23 +109,6 @@ 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 
-       wget http://www.go-mono.com/archive/glib-dev-2.0.4-20020703.zip 
-       wget http://www.go-mono.com/archive/libiconv-1.7.zip 
-       wget http://www.go-mono.com/archive/libiconv-dev-1.7.zip 
-       wget http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip
-       unzip -n -d / pkgconfig-0.11-20020310.zip
-       unzip -n -d / glib-2.0.4-20020703.zip
-       unzip -n -d / glib-dev-2.0.4-20020703.zip
-       unzip -n -d / libiconv-1.7.zip
-       unzip -n -d / libiconv-dev-1.7.zip
-       unzip -n -d / libintl-0.10.40-20020101.zip
-
-win32setup:
-       makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
-
 update-csproj:
        -rm msvc/scripts/order 
        -rm msvc/scripts/order.xml
@@ -175,4 +145,7 @@ update-llvm-version:
 update-solution-files:
        make update-csproj
        make package-inputs
-       (cd msvc/scripts; make genproj.exe; mono genproj.exe)
+       (cd msvc/scripts; make genproj.exe; mono genproj.exe $(GENPROJ_ARGS))
+
+update-solution-files-with-tests:
+       make "GENPROJ_ARGS=2012 true true" update-solution-files