From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 21 Sep 2014 06:40:44 +0000 (+0200)
Subject: tooling: Silence recursive make calls
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse.git/commitdiff_plain/1233f157ae88f4f1b9e2e232d062da492fe519b9

tooling: Silence recursive make calls

Generalize install.mk to include.mk so that it can host the Q tag
definition. Apply this tag on the recursive make call of the top-level
makefile.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

diff --git a/Makefile b/Makefile
index 673ab42..9d12b64 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 all: modules tools
 
 # includes installation-related variables and definitions
-include scripts/install.mk
+include scripts/include.mk
 
 # out-of-tree build for our kernel-module, firmware and inmates
 KDIR ?= /lib/modules/`uname -r`/build
@@ -23,7 +23,7 @@ INSTALL_MOD_PATH ?= $(DESTDIR)
 export INSTALL_MOD_PATH
 
 define run-kbuild =
-	$(MAKE) -C $(KDIR) M=$$PWD $@
+	$(Q)$(MAKE) -C $(KDIR) M=$$PWD $@
 endef
 
 modules:
@@ -33,12 +33,12 @@ hypervisor/jailhouse.bin: modules
 
 # recursive build of tools
 tools:
-	$(MAKE) -C tools
+	$(Q)$(MAKE) -C tools
 
 # clean up kernel and tools
 clean:
 	$(run-kbuild)
-	$(MAKE) -C tools $@
+	$(Q)$(MAKE) -C tools $@
 
 modules_install: modules
 	$(run-kbuild)
@@ -47,6 +47,6 @@ firmware_install: hypervisor/jailhouse.bin $(DESTDIR)$(firmwaredir)
 	$(INSTALL_DATA) $^
 
 install: modules_install firmware_install
-	$(MAKE) -C tools $@
+	$(Q)$(MAKE) -C tools $@
 
 .PHONY: modules_install install clean firmware_install modules tools
diff --git a/scripts/install.mk b/scripts/include.mk
similarity index 97%
rename from scripts/install.mk
rename to scripts/include.mk
index b60d541..b0e2bbc 100644
--- a/scripts/install.mk
+++ b/scripts/include.mk
@@ -11,6 +11,12 @@
 # the COPYING file in the top-level directory.
 #
 
+ifeq ($(V),1)
+	Q =
+else
+	Q = @
+endif
+
 prefix      ?= /usr/local
 exec_prefix ?= $(prefix)
 sbindir     ?= $(exec_prefix)/sbin
diff --git a/tools/Makefile b/tools/Makefile
index 6e4fa26..13d59e4 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,12 +10,6 @@
 # the COPYING file in the top-level directory.
 #
 
-ifeq ($(V),1)
-	Q =
-else
-	Q = @
-endif
-
 CC = $(CROSS_COMPILE)gcc
 
 CFLAGS = -g -O3 -I.. -DLIBEXECDIR=\"$(libexecdir)\" \
@@ -50,7 +44,7 @@ endef
 all: $(TARGETS)
 
 # includes installation-related variables and definitions
-include ../scripts/install.mk
+include ../scripts/include.mk
 
 jailhouse: jailhouse.c ../jailhouse.h ../VERSION
 	$(CC) $(CFLAGS) -o $@ $<