Remove mk/ folder (mono/mono#18039)

The plan to put additional helpers into this directory didn't materialize and we can just inline the one thing we have in common.mk where needed. Commit migrated from mono/mono@4e8ead7
shangte · Dec 4, 2019 · 0124300 · 0124300
1 parent c97dc67
commit 0124300
Show file tree

Hide file tree

Showing 32 changed files with 29 additions and 36 deletions.
diff --git a/src/mono/configure.ac b/src/mono/configure.ac
@@ -6253,7 +6253,7 @@ fi
 
 # Top level Makefile.am subdirs
 if test "x$with_core" = "xonly"; then
-	MONO_SUBDIRS="mk llvm mono"
+	MONO_SUBDIRS="llvm mono"
 else
 	if test "x$support_boehm" = "xyes" -a "x$libgc" = "xincluded"; then
 		mono_subdirs_libgc=external/bdwgc
@@ -6276,7 +6276,7 @@ else
 		mono_subdirs_ikvm_native=ikvm-native
 	fi
 
-	MONO_SUBDIRS="mk po $mono_subdirs_libgc llvm mono $mono_subdirs_ikvm_native $mono_subdirs_support data runtime scripts man samples $mono_subdirs_tools $mono_subdirs_docs msvc acceptance-tests"
+	MONO_SUBDIRS="po $mono_subdirs_libgc llvm mono $mono_subdirs_ikvm_native $mono_subdirs_support data runtime scripts man samples $mono_subdirs_tools $mono_subdirs_docs msvc acceptance-tests"
 fi
 
 AC_SUBST(MONO_SUBDIRS)

diff --git a/src/mono/m4/mono-output.m4 b/src/mono/m4/mono-output.m4
@@ -14,7 +14,6 @@ AC_DEFUN([AC_MONO_OUTPUT], [
 	AC_OUTPUT([
 		Makefile
 		llvm/Makefile
-		mk/Makefile
 		mono/Makefile
 		mono/btls/Makefile
 		mono/native/Makefile

diff --git a/src/mono/mk/.gitignore b/src/mono/mk/.gitignore
diff --git a/src/mono/mk/Makefile.am b/src/mono/mk/Makefile.am
diff --git a/src/mono/mk/common.mk b/src/mono/mk/common.mk
diff --git a/src/mono/mono/Makefile.am b/src/mono/mono/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 if SUPPORT_SGEN
 sgen_dirs = sgen

diff --git a/src/mono/mono/arch/Makefile.am b/src/mono/mono/arch/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 DIST_SUBDIRS = x86 ppc sparc arm arm64 s390x amd64 mips riscv
 

diff --git a/src/mono/mono/arch/amd64/Makefile.am b/src/mono/mono/arch/amd64/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 EXTRA_DIST =  amd64-codegen.h
 
diff --git a/src/mono/mono/arch/arm/Makefile.am b/src/mono/mono/arch/arm/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 

diff --git a/src/mono/mono/arch/arm64/Makefile.am b/src/mono/mono/arch/arm64/Makefile.am
@@ -1,3 +1,3 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 EXTRA_DIST = arm64-codegen.h codegen-test.c
diff --git a/src/mono/mono/arch/mips/Makefile.am b/src/mono/mono/arch/mips/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 

diff --git a/src/mono/mono/arch/ppc/Makefile.am b/src/mono/mono/arch/ppc/Makefile.am
@@ -1,3 +1,3 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 EXTRA_DIST = ppc-codegen.h
diff --git a/src/mono/mono/arch/s390x/Makefile.am b/src/mono/mono/arch/s390x/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 

diff --git a/src/mono/mono/arch/sparc/Makefile.am b/src/mono/mono/arch/sparc/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 EXTRA_DIST = sparc-codegen.h
 
diff --git a/src/mono/mono/arch/x86/Makefile.am b/src/mono/mono/arch/x86/Makefile.am
@@ -1,3 +1,3 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 EXTRA_DIST = x86-codegen.h
diff --git a/src/mono/mono/benchmark/Makefile.am b/src/mono/mono/benchmark/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 TEST_PROG=../mini/mono
 RUNTIME_ARGS="-O=all"

diff --git a/src/mono/mono/cil/Makefile.am b/src/mono/mono/cil/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 # opcode.def is not built by default -- based on timestamps.
 # CI does not have the dependencies installed (perl, XML::Parser).

diff --git a/src/mono/mono/dis/Makefile.am b/src/mono/mono/dis/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 if !ENABLE_MSVC_ONLY
 

diff --git a/src/mono/mono/eglib/Makefile.am b/src/mono/mono/eglib/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 if !ENABLE_MSVC_ONLY
 

diff --git a/src/mono/mono/eglib/test/Makefile.am b/src/mono/mono/eglib/test/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 EXTRA_DIST = UTF-8.txt UTF-16BE.txt UTF-16LE.txt UTF-32BE.txt UTF-32LE.txt test-eglib.exp
 

diff --git a/src/mono/mono/metadata/Makefile.am b/src/mono/mono/metadata/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 if !ENABLE_MSVC_ONLY
 

diff --git a/src/mono/mono/mini/Makefile.am.in b/src/mono/mono/mini/Makefile.am.in
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 ## Set the C++ linker based on configure settings, see comment in configure.ac
 ## about why we need to do this.

diff --git a/src/mono/mono/profiler/Makefile.am b/src/mono/mono/profiler/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 AM_CPPFLAGS = \
 	-DSUPPRESSION_DIR=\""$(datadir)/mono-$(API_VER)/mono/profiler"\" \

diff --git a/src/mono/mono/sgen/Makefile.am b/src/mono/mono/sgen/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 if !ENABLE_MSVC_ONLY
 

diff --git a/src/mono/mono/tests/Makefile.am b/src/mono/mono/tests/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 SUBDIRS = gc-descriptors . testing_gac assembly-load-reference llvmonly-mixed fullaot-mixed
 

diff --git a/src/mono/mono/tests/assembly-load-reference/Makefile.am b/src/mono/mono/tests/assembly-load-reference/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 ### buildtree stuff
 

diff --git a/src/mono/mono/tests/gc-descriptors/Makefile.am b/src/mono/mono/tests/gc-descriptors/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
 

diff --git a/src/mono/mono/tests/testing_gac/Makefile.am b/src/mono/mono/tests/testing_gac/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 ### buildtree stuff
 

diff --git a/src/mono/mono/unit-tests/Makefile.am b/src/mono/mono/unit-tests/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono -I$(top_srcdir)/samples $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 

diff --git a/src/mono/mono/utils/Makefile.am b/src/mono/mono/utils/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 if !ENABLE_MSVC_ONLY
 

diff --git a/src/mono/mono/utils/jemalloc/Makefile.am b/src/mono/mono/utils/jemalloc/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 #
 # Conditional submodule for jemalloc

diff --git a/src/mono/mono/zlib/Makefile.am b/src/mono/mono/zlib/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/mk/common.mk
+MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
 
 ZLIB_SOURCE = \
 	adler32.c	\