From aba33a03341dd80bd3cb9efea1001f42bd82c715 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 24 Jun 2012 19:38:37 +0000 Subject: [PATCH] Don't enforce silent output on submake - pass down the value set by the user implicitly instead. --- Bootloaders/makefile | 4 ++-- BuildTests/BoardDriverTest/makefile | 8 ++++---- BuildTests/BootloaderTest/makefile | 2 +- BuildTests/ModuleTest/makefile | 12 ++++++------ BuildTests/SingleUSBModeTest/makefile | 16 ++++++++-------- Demos/Device/ClassDriver/makefile | 4 ++-- Demos/Device/LowLevel/makefile | 4 ++-- Demos/DualRole/ClassDriver/makefile | 4 ++-- Demos/Host/ClassDriver/makefile | 4 ++-- Demos/Host/LowLevel/makefile | 4 ++-- Projects/makefile | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Bootloaders/makefile b/Bootloaders/makefile index bffee425d9..01aa506fd5 100644 --- a/Bootloaders/makefile +++ b/Bootloaders/makefile @@ -24,8 +24,8 @@ endif all: ifeq ($(OBJDIR),) - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;) endif %: - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;) diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile index 3bbfaece13..f039a3a7d5 100644 --- a/BuildTests/BoardDriverTest/makefile +++ b/BuildTests/BoardDriverTest/makefile @@ -45,7 +45,7 @@ testboards: echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu"; \ \ printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \ - printf "\t$(MAKE) -s -f makefile.test clean elf MCU=%s ARCH=%s BOARD=%s\n\n" $$build_mcu $$build_arch $$build_board >> BuildMakefile; \ + printf "\t$(MAKE) -f makefile.test clean elf MCU=%s ARCH=%s BOARD=%s\n\n" $$build_mcu $$build_arch $$build_board >> BuildMakefile; \ fi; \ done < BoardList.txt @@ -54,9 +54,9 @@ testboards: clean: rm -f BuildMakefile rm -f BoardList.txt - $(MAKE) -s -f makefile.test clean BOARD=NONE ARCH=AVR8 MCU=at90usb1287 - $(MAKE) -s -f makefile.test clean BOARD=NONE ARCH=XMEGA MCU=atxmega128a1u - $(MAKE) -s -f makefile.test clean BOARD=NONE ARCH=UC3 MCU=uc3a0256 + $(MAKE) -f makefile.test clean BOARD=NONE ARCH=AVR8 MCU=at90usb1287 + $(MAKE) -f makefile.test clean BOARD=NONE ARCH=XMEGA MCU=atxmega128a1u + $(MAKE) -f makefile.test clean BOARD=NONE ARCH=UC3 MCU=uc3a0256 %: diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile index e894e6f79f..d15a85e4bf 100644 --- a/BuildTests/BootloaderTest/makefile +++ b/BuildTests/BootloaderTest/makefile @@ -44,7 +44,7 @@ testbootloaders: printf "Found '%s' bootloader configuration (FLASH: %3s KB | BOOT: %3s KB | MCU: %12s / %4s)\n" $$build_bootloader $$build_flashsize $$build_bootsize $$build_mcu $$build_arch; \ \ printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \ - printf "\t$(MAKE) -s -C $(patsubst %/,%,$(LUFA_PATH))/../Bootloaders/%s/ clean elf ARCH=%s MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s\n\n" $$build_bootloader $$build_arch $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \ + printf "\t$(MAKE) -C $(patsubst %/,%,$(LUFA_PATH))/../Bootloaders/%s/ clean elf ARCH=%s MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s\n\n" $$build_bootloader $$build_arch $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \ fi; \ done < BootloaderDeviceMap.cfg diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile index 1d243ddc69..196fc32b21 100644 --- a/BuildTests/ModuleTest/makefile +++ b/BuildTests/ModuleTest/makefile @@ -40,20 +40,20 @@ end: %.avr8: @echo Building ModuleTest for ARCH=AVR8 MCU=$(@:%.avr8=%)... - $(MAKE) -s -f makefile.test clean elf ARCH=AVR8 MCU=$(@:%.avr8=%) + $(MAKE) -f makefile.test clean elf ARCH=AVR8 MCU=$(@:%.avr8=%) %.xmega: @echo Building ModuleTest for ARCH=XMEGA MCU=$(@:%.xmega=%)... - $(MAKE) -s -f makefile.test clean elf ARCH=XMEGA MCU=$(@:%.xmega=%) + $(MAKE) -f makefile.test clean elf ARCH=XMEGA MCU=$(@:%.xmega=%) %.uc3: @echo Building ModuleTest for ARCH=UC3 MCU=$(@:%.uc3=%)... - $(MAKE) -s -f makefile.test clean elf ARCH=UC3 MCU=$(@:%.uc3=%) + $(MAKE) -f makefile.test clean elf ARCH=UC3 MCU=$(@:%.uc3=%) clean: - $(MAKE) -s -f makefile.test clean ARCH=AVR8 MCU=$(firstword $(AVR8_FAMILIES)) - $(MAKE) -s -f makefile.test clean ARCH=XMEGA MCU=$(firstword $(XMEGA_FAMILIES)) - $(MAKE) -s -f makefile.test clean ARCH=UC3 MCU=$(firstword $(UC3_FAMILIES)) + $(MAKE) -f makefile.test clean ARCH=AVR8 MCU=$(firstword $(AVR8_FAMILIES)) + $(MAKE) -f makefile.test clean ARCH=XMEGA MCU=$(firstword $(XMEGA_FAMILIES)) + $(MAKE) -f makefile.test clean ARCH=UC3 MCU=$(firstword $(UC3_FAMILIES)) %: diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile index 14667474cf..7b5b06040d 100644 --- a/BuildTests/SingleUSBModeTest/makefile +++ b/BuildTests/SingleUSBModeTest/makefile @@ -26,24 +26,24 @@ end: compile: @echo Building SingleUSBModeTest for ARCH=AVR8 in device only mode... - $(MAKE) -s -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CC_FLAGS='-D USB_DEVICE_ONLY' + $(MAKE) -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CC_FLAGS='-D USB_DEVICE_ONLY' @echo Building SingleUSBModeTest for ARCH=AVR8 in host only mode... - $(MAKE) -s -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CC_FLAGS='-D USB_HOST_ONLY' + $(MAKE) -f makefile.test clean elf ARCH=AVR8 MCU=at90usb1287 CC_FLAGS='-D USB_HOST_ONLY' @echo Building SingleUSBModeTest for ARCH=XMEGA in device only mode... - $(MAKE) -s -f makefile.test clean elf ARCH=XMEGA MCU=atxmega128a1u CC_FLAGS='-D USB_DEVICE_ONLY' + $(MAKE) -f makefile.test clean elf ARCH=XMEGA MCU=atxmega128a1u CC_FLAGS='-D USB_DEVICE_ONLY' @echo Building SingleUSBModeTest for ARCH=UC3 in device only mode... - $(MAKE) -s -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CC_FLAGS='-D USB_DEVICE_ONLY' + $(MAKE) -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CC_FLAGS='-D USB_DEVICE_ONLY' @echo Building SingleUSBModeTest for ARCH=UC3 in host only mode... - $(MAKE) -s -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CC_FLAGS='-D USB_HOST_ONLY' + $(MAKE) -f makefile.test clean elf ARCH=UC3 MCU=uc3a0256 CC_FLAGS='-D USB_HOST_ONLY' clean: - $(MAKE) -s -f makefile.test clean ARCH=AVR8 MCU=at90usb1287 - $(MAKE) -s -f makefile.test clean ARCH=XMEGA MCU=atxmega128a1u - $(MAKE) -s -f makefile.test clean ARCH=UC3 MCU=uc3a0256 + $(MAKE) -f makefile.test clean ARCH=AVR8 MCU=at90usb1287 + $(MAKE) -f makefile.test clean ARCH=XMEGA MCU=atxmega128a1u + $(MAKE) -f makefile.test clean ARCH=UC3 MCU=uc3a0256 %: diff --git a/Demos/Device/ClassDriver/makefile b/Demos/Device/ClassDriver/makefile index 0e1dfae05b..ad88000911 100644 --- a/Demos/Device/ClassDriver/makefile +++ b/Demos/Device/ClassDriver/makefile @@ -24,8 +24,8 @@ endif all: ifeq ($(OBJDIR),) - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;) endif %: - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;) diff --git a/Demos/Device/LowLevel/makefile b/Demos/Device/LowLevel/makefile index 0e1dfae05b..ad88000911 100644 --- a/Demos/Device/LowLevel/makefile +++ b/Demos/Device/LowLevel/makefile @@ -24,8 +24,8 @@ endif all: ifeq ($(OBJDIR),) - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;) endif %: - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;) diff --git a/Demos/DualRole/ClassDriver/makefile b/Demos/DualRole/ClassDriver/makefile index dc41c9b482..741383f18a 100644 --- a/Demos/DualRole/ClassDriver/makefile +++ b/Demos/DualRole/ClassDriver/makefile @@ -24,9 +24,9 @@ endif all: ifeq ($(OBJDIR),) - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;) endif %: - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;) diff --git a/Demos/Host/ClassDriver/makefile b/Demos/Host/ClassDriver/makefile index 128a22f570..d9a3dc3594 100644 --- a/Demos/Host/ClassDriver/makefile +++ b/Demos/Host/ClassDriver/makefile @@ -24,8 +24,8 @@ endif all: ifeq ($(OBJDIR),) - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;) endif %: - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;) diff --git a/Demos/Host/LowLevel/makefile b/Demos/Host/LowLevel/makefile index 128a22f570..d9a3dc3594 100644 --- a/Demos/Host/LowLevel/makefile +++ b/Demos/Host/LowLevel/makefile @@ -24,8 +24,8 @@ endif all: ifeq ($(OBJDIR),) - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;) endif %: - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;) diff --git a/Projects/makefile b/Projects/makefile index e169689bf1..2bc9f98b19 100644 --- a/Projects/makefile +++ b/Projects/makefile @@ -24,8 +24,8 @@ endif all: ifeq ($(OBJDIR),) - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;) endif %: - @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;) + @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;)