projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[msbuild] Bump to xplat-master branch HEAD
[mono.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ede769564985d5b87cdf226a5ee99e9783381c44..8cb099618a19551ee5e4f95c45d0f55e43db84ff 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2,7
+2,7
@@
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = $(WERROR_CFLAGS)
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
# Some tools might not build when cross-compiling
if CROSS_COMPILING
@@
-11,9
+11,9
@@
else
tools_dir = tools
endif
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
# 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
all: update_submodules
@@
-50,14
+50,9
@@
noinst_DATA = mono-uninstalled.pc
DISTCLEANFILES= mono-uninstalled.pc
# building with monolite
DISTCLEANFILES= mono-uninstalled.pc
# building with monolite
-mcslib = $(mcs_topdir)/class/lib
-monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
.PHONY: get-monolite-latest
get-monolite-latest:
.PHONY: get-monolite-latest
get-monolite-latest:
- -rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
- -mkdir -p $(mcslib)/monolite
- cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
- cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
+ $(MAKE) -C $(mcs_topdir)/class get-monolite-latest
if BITCODE
BITCODE_CHECK=yes
if BITCODE
BITCODE_CHECK=yes