Merge pull request #3549 from lewurm/arm64-icache-big-little-fix

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 330f8d00ce53851b060fc3b2128614ab3a2ee634..aaffb9842ba9dbe36090cead00afe0d1ebe1232d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,18 +4,17 @@ AM_CFLAGS = $(WERROR_CFLAGS)
 
 MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
 
+# Some tools might not build when cross-compiling
 if CROSS_COMPILING
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
-# 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
+tools_dir =
 else
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
-# 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
+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
+# 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
+
 all: update_submodules
 
 SUBMODULE_ERROR='Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date'
@@ -25,13 +24,15 @@ update_submodules:
 .PHONY: update_submodules
 
 EXTRA_DIST= \
-        README.md \
-           LICENSE \
-           autogen.sh \
-           mkinstalldirs \
-           mono-uninstalled.pc.in \
-           winconfig.h \
-           external
+       README.md               \
+       LICENSE                 \
+       autogen.sh              \
+       mkinstalldirs           \
+       mono-uninstalled.pc.in  \
+       winconfig.h             \
+       code_of_conduct.md      \
+       external                \
+       mcs/class/referencesource
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
@@ -66,6 +67,14 @@ get-monolite-latest:
        cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
        cd $(mcslib) && mv -f monolite-* monolite
 
+if BITCODE
+BITCODE_CHECK=yes
+endif
+
+.PHONY: check-ci
+check-ci:
+       MONO_LLVMONLY=$(BITCODE_CHECK) $(srcdir)/scripts/ci/run-test-$(TEST_PROFILE).sh
+
 .PHONY: validate do-build-mono-mcs mcs-do-clean mcs-do-tests
 validate: do-build-mono-mcs
        $(MAKE) mcs-do-tests
@@ -151,6 +160,7 @@ package-inputs:
                 read libou;  echo "      <library_output>$$libou</library_output>"; \
                 read fx_ver; echo "      <fx_version>$$fx_ver</fx_version>"; \
                 read profile; echo "      <profile>$$profile</profile>"; \
+                read resxt;  echo "      <resources>$$resxt</resources>"; \
                 read resp;   echo "      <response>$$resp</response>"; \
                 echo "    </project>") >> msvc/scripts/order.xml; \
        done
@@ -162,3 +172,7 @@ update-llvm-version:
        REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
 
 
+update-solution-files:
+       make update-csproj
+       make package-inputs
+       (cd msvc/scripts; make genproj.exe; mono genproj.exe)