diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-11-23 00:48:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-23 00:48:11 +0300 |
| commit | 0d8037217302a15c83687dcd31e4136baf4f360f (patch) | |
| tree | 93a68bbb021942e378628b7221bd00214d8fa8b5 /Makefile.am | |
| parent | 93e46c687b0f1b3bea7ecf362a667f3bd8b59fc5 (diff) | |
Make configure.ac and Makefile.am work without certain directories (#17871)
Those folders won't be present in the dotnet/runtime repository.
We need to factor out AC_OUTPUT into a separate file so we can continue
to share configure.ac but not the list of files in AC_OUTPUT since
autotools doesn't support variables there.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 56 |
1 files changed, 5 insertions, 51 deletions
diff --git a/Makefile.am b/Makefile.am index 204be65c6c1..e050a6a8c5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,33 +2,10 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = $(WERROR_CFLAGS) -MONOTOUCH_SUBDIRS = $(libgc_dir) mono +SUBDIRS = @MONO_SUBDIRS@ +DIST_SUBDIRS = $(SUBDIRS) m4 netcore netcore/corerun -# Some tools might not build when cross-compiling -if CROSS_COMPILING -tools_dir = -else -tools_dir = tools -endif - -if ENABLE_MSVC -build_with_msvc = msvc -build_without_msvc = -else -build_with_msvc = -build_without_msvc = msvc -endif - -if ENABLE_NETCORE -update_submodules = -SUBDIRS = mk llvm mono runtime netcore -else -update_submodules = update_submodules -SUBDIRS = $(build_with_msvc) mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) $(build_without_msvc) $(docs_dir) acceptance-tests -endif - -# Keep in sync with SUBDIRS -DIST_SUBDIRS = $(build_with_msvc) m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools $(build_without_msvc) docs acceptance-tests netcore netcore/corerun +if !ENABLE_NETCORE all: $(update_submodules) @@ -116,31 +93,6 @@ mcs-do-compiler-tests: bootstrap-world: compiler-tests $(MAKE) install -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 - update-csproj: -rm msvc/scripts/order -rm msvc/scripts/order.xml @@ -183,3 +135,5 @@ update-solution-files: update-solution-files-with-tests: $(MAKE) "GENPROJ_ARGS=2012 true true" update-solution-files + +endif |