Received: from eggs.gnu.org ([2001:4830:134:3::10]:51563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAKmq-0008CF-8x for qemu-devel@nongnu.org; Mon, 03 Feb 2014 09:46:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WAKmk-00044f-81 for qemu-devel@nongnu.org; Mon, 03 Feb 2014 09:46:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19295) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAKmj-000445-UB for qemu-devel@nongnu.org; Mon, 03 Feb 2014 09:46:06 -0500 From: Gerd Hoffmann Date: Mon, 3 Feb 2014 15:45:53 +0100 Message-Id: <1391438755-30975-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1391438755-30975-1-git-send-email-kraxel@redhat.com> References: <1391438755-30975-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] roms: remove explicit MAKEFLAGS from recursive make invocations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Bruce Rogers From: Bruce Rogers When using $(MAKE) within a makefile, we shouldn't be explicitly including $(MAKEFLAGS) on the command-line. It causes problems when that makefile is recursively invoked. When the roms/Makefile is invoked as in make -C roms bios a spurious 'w' appears on the sub-make invocation, due to the erroneous $(MAKEFLAGS) inclusion. Signed-off-by: Bruce Rogers Signed-off-by: Gerd Hoffmann --- roms/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/roms/Makefile b/roms/Makefile index 1e04669..2721b02 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -72,11 +72,11 @@ seavgabios-%: build-seabios-config-vga-% build-seabios-config-%: config.% mkdir -p seabios/builds/$* cp $< seabios/builds/$*/.config - $(MAKE) $(MAKEFLAGS) -C seabios \ + $(MAKE) -C seabios \ CROSS_COMPILE=$(x86_64_cross_prefix) \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig - $(MAKE) $(MAKEFLAGS) -C seabios \ + $(MAKE) -C seabios \ CROSS_COMPILE=$(x86_64_cross_prefix) \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ OUT=$(CURDIR)/seabios/builds/$*/ all @@ -90,12 +90,12 @@ lgplvgabios-%: build-lgplvgabios cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin build-lgplvgabios: - $(MAKE) $(MAKEFLAGS) -C vgabios $(vgabios_targets) + $(MAKE) -C vgabios $(vgabios_targets) .PHONY: sgabios sgabios: - $(MAKE) $(MAKEFLAGS) -C sgabios + $(MAKE) -C sgabios cp sgabios/sgabios.bin ../pc-bios @@ -114,12 +114,12 @@ efi-rom-%: build-pxe-roms build-efi-roms -o ../pc-bios/efi-$*.rom build-pxe-roms: ipxe/src/config/local/general.h - $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + $(MAKE) -C ipxe/src GITVERSION="" \ CROSS_COMPILE=$(x86_64_cross_prefix) \ $(patsubst %,bin/%.rom,$(pxerom_targets)) build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h - $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + $(MAKE) -C ipxe/src GITVERSION="" \ CROSS_COMPILE=$(x86_64_cross_prefix) \ $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) @@ -129,15 +129,15 @@ ipxe/src/config/local/%: config.ipxe.% slof: - $(MAKE) $(MAKEFLAGS) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu + $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu cp SLOF/boot_rom.bin ../pc-bios/slof.bin clean: rm -rf seabios/.config seabios/out seabios/builds - $(MAKE) $(MAKEFLAGS) -C vgabios clean + $(MAKE) -C vgabios clean rm -f vgabios/VGABIOS-lgpl-latest* - $(MAKE) $(MAKEFLAGS) -C sgabios clean + $(MAKE) -C sgabios clean rm -f sgabios/.depend - $(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean - $(MAKE) $(MAKEFLAGS) -C SLOF clean + $(MAKE) -C ipxe/src veryclean + $(MAKE) -C SLOF clean -- 1.8.3.1