~ruther/qmk_firmware

a53bc24c4d5a6b1f31060e43789a12af6e39b572 — Jack Humbert 9 years ago 17977a7
makes .SILENT (less verbose) by default - override with VERBOSE=1

also took out some @echo newlines to make things a bit cleaner
2 files changed, 4 insertions(+), 14 deletions(-)

M quantum/quantum.mk
M tmk_core/rules.mk
M quantum/quantum.mk => quantum/quantum.mk +4 -0
@@ 1,5 1,9 @@
QUANTUM_DIR = quantum

ifndef VERBOSE
.SILENT:
endif

# # project specific files
SRC += $(QUANTUM_DIR)/quantum.c \
	$(QUANTUM_DIR)/keymap_common.c \

M tmk_core/rules.mk => tmk_core/rules.mk +0 -14
@@ 393,12 393,10 @@ lib: $(LIBNAME)
# AVR Studio 3.x does not check make's exit code but relies on
# the following magic strings to be generated by the compile job.
begin:
	@echo
	@echo $(MSG_BEGIN)

end:
	@echo $(MSG_END)
	@echo


# Display size of file.


@@ 505,13 503,11 @@ COFFCONVERT += --change-section-address .eeprom-0x810000


coff: $(TARGET).elf
	@echo
	@echo $(MSG_COFF) $(TARGET).cof
	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof


extcoff: $(TARGET).elf
	@echo
	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof
	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof



@@ 519,25 515,21 @@ extcoff: $(TARGET).elf

# Create final output files (.hex, .eep) from ELF output file.
%.hex: %.elf
	@echo
	@echo $(MSG_FLASH) $@
	$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@

%.eep: %.elf
	@echo
	@echo $(MSG_EEPROM) $@
	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
	--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0

# Create extended listing file from ELF output file.
%.lss: %.elf
	@echo
	@echo $(MSG_EXTENDED_LISTING) $@
	$(OBJDUMP) -h -S -z $< > $@

# Create a symbol table from ELF output file.
%.sym: %.elf
	@echo
	@echo $(MSG_SYMBOL_TABLE) $@
	$(NM) -n $< > $@



@@ 547,7 539,6 @@ extcoff: $(TARGET).elf
.SECONDARY : $(TARGET).a
.PRECIOUS : $(OBJ)
%.a: $(OBJ)
	@echo
	@echo $(MSG_CREATING_LIBRARY) $@
	$(AR) $@ $(OBJ)



@@ 556,14 547,12 @@ extcoff: $(TARGET).elf
.SECONDARY : $(TARGET).elf
.PRECIOUS : $(OBJ)
%.elf: $(OBJ)
	@echo
	@echo $(MSG_LINKING) $@
	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)


# Compile: create object files from C source files.
$(OBJDIR)/%.o : %.c
	@echo
	mkdir -p $(@D)
	@echo $(MSG_COMPILING) $<
	$(CC) -c $(ALL_CFLAGS) $< -o $@ 


@@ 571,7 560,6 @@ $(OBJDIR)/%.o : %.c

# Compile: create object files from C++ source files.
$(OBJDIR)/%.o : %.cpp
	@echo
	mkdir -p $(@D)
	@echo $(MSG_COMPILING_CPP) $<
	$(CC) -c $(ALL_CPPFLAGS) $< -o $@ 


@@ 589,7 577,6 @@ $(OBJDIR)/%.o : %.cpp

# Assemble: create object files from assembler source files.
$(OBJDIR)/%.o : %.S
	@echo
	mkdir -p $(@D)
	@echo $(MSG_ASSEMBLING) $<
	$(CC) -c $(ALL_ASFLAGS) $< -o $@


@@ 604,7 591,6 @@ $(OBJDIR)/%.o : %.S
clean: begin clean_list end

clean_list :
	@echo
	$(REMOVE) $(TARGET).hex
	$(REMOVE) $(TARGET).eep
	$(REMOVE) $(TARGET).cof