summaryrefslogtreecommitdiffstats
path: root/scripts/mkmakefile
diff options
context:
space:
mode:
authorDennis Menschel <menschel-d@posteo.de>2017-03-26 12:40:37 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-04-11 08:19:23 +0200
commitd77ef53b37f3ccecaa946dd9e63f7330c2467b9f (patch)
tree671c58e58c95284f04fb14d8072545cf5aa008c7 /scripts/mkmakefile
parent90e7a35e684fc66dcc05791c7b2cb73255a9fbcc (diff)
downloadbarebox-d77ef53b37f3ccecaa946dd9e63f7330c2467b9f.tar.gz
scripts: mkmakefile: apply changes from Linux kernel
The version of mkmakefile which has been used in barebox until now dates back to commit fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 from the Linux kernel git history (Tue May 2 12:33:20 2006 +0200). This patch effectively includes all changes from the aforementioned commit to the latest stable version of the Linux kernel: git log --pretty=oneline --abbrev-commit fd5f0cd..v4.10 scripts/mkmakefile 06ed5c2 kbuild: Make scripts executable 9319f45 kbuild: support simultaneous "make %config" and "make all" 0ff3577 kbuild: silence generated makefile message 3c955b4 fixes for using make 3.82 d230124 kbuild: teach mkmakfile to be silent 1d3b3bf kbuild: scripts/mkmakefile: dynamic determination of output directory 971edcf kbuild: re-enable Makefile generation in a new O=... directory 18c32da kbuild: fix building with O=.. options 0b35786 kbuild: call make once for all targets when O=.. is used In particular, the list of changes includes a fix for the following Make warning: Makefile:18: *** mixed implicit and normal rules: deprecated syntax GNU Make 3.82 raises an error instead of a warning and aborts the make process. GNU Make 3.82 is still used today by distributions like Red Hat Enterprise Linux 7.3. Signed-off-by: Dennis Menschel <menschel-d@posteo.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts/mkmakefile')
-rwxr-xr-x[-rw-r--r--]scripts/mkmakefile36
1 files changed, 26 insertions, 10 deletions
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 7f9d544..84af27b 100644..100755
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -11,7 +11,15 @@
test ! -r $2/Makefile -o -O $2/Makefile || exit 0
-echo " GEN $2/Makefile"
+# Only overwrite automatically generated Makefiles
+# (so we do not overwrite kernel Makefile)
+if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
+then
+ exit 0
+fi
+if [ "${quiet}" != "silent_" ]; then
+ echo " GEN $2/Makefile"
+fi
cat << EOF > $2/Makefile
# Automatically generated by $0: don't edit
@@ -19,18 +27,26 @@ cat << EOF > $2/Makefile
VERSION = $3
PATCHLEVEL = $4
-KERNELSRC := $1
-KERNELOUTPUT := $2
+lastword = \$(word \$(words \$(1)),\$(1))
+makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST)))
-MAKEFLAGS += --no-print-directory
+ifeq ("\$(origin V)", "command line")
+VERBOSE := \$(V)
+endif
+ifneq (\$(VERBOSE),1)
+Q := @
+endif
+
+MAKEARGS := -C $1
+MAKEARGS += O=\$(if \$(patsubst /%,,\$(makedir)),\$(CURDIR)/)\$(patsubst %/,%,\$(makedir))
-.PHONY: all \$(MAKECMDGOALS)
+MAKEFLAGS += --no-print-directory
-all:
- \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT)
+.PHONY: __sub-make \$(MAKECMDGOALS)
-Makefile:;
+__sub-make:
+ \$(Q)\$(MAKE) \$(MAKEARGS) \$(MAKECMDGOALS)
-\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/:
- \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
+\$(filter-out __sub-make, \$(MAKECMDGOALS)): __sub-make
+ @:
EOF