From 90d65a6fd6d6e2dcb49c3edc6a9e3d685d80b070 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 25 Jun 2013 14:57:15 -0400
Subject: [PATCH] Revert "Makefile: Make it possible to build a quite build."

This reverts commit 18626953718e73906bd9745855edc8f14c5ad521.

Conflicts:
	Makefile

It makes it soo much harder to troubleshoot
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 Makefile | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index b79d346..7d00933 100644
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,6 @@ COMPONENTS = root_image linux syslinux xen
 TOP= .
 include sources.mk
 
-ifeq ("$(origin V)", "command line")
-  KBUILD_VERBOSE = $(V)
-endif
-ifndef KBUILD_VERBOSE
-  KBUILD_VERBOSE = 0
-endif
 #####################################################################
 #			  exported variables
 #####################################################################
@@ -94,19 +88,11 @@ NCPUS := $(shell grep processor /proc/cpuinfo | wc -l)
 .PHONY:	linux-dist-nodep
 linux-dist-nodep: linux-config
 ifeq ($(OLDSTYLE),1)
-ifeq ($(KBUILD_VERBOSE),1)
 	$(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) vmlinuz
-else
-	$(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) vmlinuz 1>/dev/null
-endif
 	$(INSTALL_DIR) dist/common/
 	$(INSTALL_DATA) $(LINUX_DST)/arch/$(ARCH)/boot/vmlinuz dist/common/vmlinuz
 else
-ifeq ($(KBUILD_VERBOSE),1)
 	$(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) bzImage
-else
-	$(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) bzImage 1>/dev/null
-endif
 	$(INSTALL_DIR) dist/common/
 	$(INSTALL_DATA) $(LINUX_DST)/arch/$(ARCH)/boot/bzImage dist/common/vmlinuz
 endif
@@ -176,11 +162,7 @@ xen-dist-nodep:
 ifeq ($(ARCH),i386)
 	touch xen/xen/xen.gz
 else
-ifeq ($(KBUILD_VERBOSE),1)
 	$(MAKE) -C xen $(XEN_OPTS) xen -j$$(($(NCPUS) * 2))
-else
-	$(MAKE) -C xen $(XEN_OPTS) xen -j$$(($(NCPUS) * 2)) 1>/dev/null
-endif
 endif
 
 	$(INSTALL_DIR) dist/common/
@@ -194,11 +176,8 @@ IOEMU_DIR = ioemu-remote
 .PHONY: xen-tools
 xen-tools:
 #	$(MAKE) -C xen dist-misc -j$$(($(NCPUS) * 2))
-ifeq ($(KBUILD_VERBOSE),1)
+
 	$(MAKE) -C xen IOEMU_CONFIGURE_CROSS="--disable-curses --disable-slirp --disable-opengl --disable-sdl --disable-kvm --disable-vnc-tls" tools -j$$(($(NCPUS) * 2))
-else
-	$(MAKE) -C xen IOEMU_CONFIGURE_CROSS="--disable-curses --disable-slirp --disable-opengl --disable-sdl --disable-kvm --disable-vnc-tls" tools -j$$(($(NCPUS) * 2)) 1>/dev/null
-endif
 
 ifeq ($(NOXEN),1)
 .PHONY: xen-dist
@@ -231,11 +210,7 @@ DOM0_DEP_LIST = linux-modules
 
 .PHONY: root_image-dist-nodep
 root_image-dist-nodep:  $(LINUX_SRC)/usr/gen_init_cpio
-ifeq ($(KBUILD_VERBOSE),1)
 	$(MAKE)  -C root_image
-else
-	$(MAKE)  -C root_image 1>/dev/null
-endif
 	$(INSTALL_DIR) dist/common/
 	$(INSTALL_DATA) root_image/dist/common/initramfs.cpio.gz dist/common/
 
-- 
2.39.5