diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2016-06-10 09:52:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 09:52:03 +0300 |
| commit | 2f6e404ed1a274e942ba0325b55ce610c25a23f2 (patch) | |
| tree | a3f7e9b4214bc8a943b343b6d1e0aa5825203d3e /Makefile.am | |
| parent | ff55074476e584cd44d434af9186d611f8122adf (diff) | |
[runtime] Move 'pedump' to tools/pedump, build tools by default. (#3133)
* [runtime] Move 'pedump' to tools/pedump, build tools by default.
* Add missing file.
* [runtime] Mark mono_opcodes[] with MONO_API.
* [runtime] Build monograph when sgen is supported instead of boehm.
* [runtime] Link monograph against the static runtime libraries.
* [runtime] Use the same SUBDIRS/DIST_SUBDIRS for the CROSS_COMPILING case.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index c0672460ea0..5e0c053956a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,17 +4,9 @@ AM_CFLAGS = $(WERROR_CFLAGS) MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono -if CROSS_COMPILING -SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests llvm +SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples tools msvc $(docs_dir) acceptance-tests llvm # Keep in sync with SUBDIRS -## 'tools' is not normally built DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm -else -SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests llvm -# Keep in sync with SUBDIRS -## 'tools' is not normally built -DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm -endif all: update_submodules |