mirrors/qmk_firmware
1
0
Fork 1
mirror of https://github.com/qmk/qmk_firmware synced 2024-11-10 05:59:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

makes .SILENT (less verbose) by default - override with VERBOSE=1

Browse source 
also took out some @echo newlines to make things a bit cleaner
This commit is contained in:
Jack Humbert 2016-05-28 15:33:08 -04:00
parent 17977a7e24
commit a53bc24c4d
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
quantum/quantum.mk
View file

@ -1,5 +1,9 @@
QUANTUM_DIR = quantum QUANTUM_DIR = quantum
ifndef VERBOSE
.SILENT:
endif
# # project specific files # # project specific files
SRC += $(QUANTUM_DIR)/quantum.c \ SRC += $(QUANTUM_DIR)/quantum.c \
$(QUANTUM_DIR)/keymap_common.c \ $(QUANTUM_DIR)/keymap_common.c \

14
tmk_core/rules.mk
View file

@ -393,12 +393,10 @@ lib: $(LIBNAME)
# AVR Studio 3.x does not check make's exit code but relies on # 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. # the following magic strings to be generated by the compile job.
begin: begin:
@echo
@echo $(MSG_BEGIN) @echo $(MSG_BEGIN)
end: end:
@echo $(MSG_END) @echo $(MSG_END)
@echo
# Display size of file. # Display size of file.
@ -505,13 +503,11 @@ COFFCONVERT += --change-section-address .eeprom-0x810000
coff: $(TARGET).elf coff: $(TARGET).elf
@echo
@echo $(MSG_COFF) $(TARGET).cof @echo $(MSG_COFF) $(TARGET).cof
$(COFFCONVERT) -O coff-avr $< $(TARGET).cof $(COFFCONVERT) -O coff-avr $< $(TARGET).cof
extcoff: $(TARGET).elf extcoff: $(TARGET).elf
@echo
@echo $(MSG_EXTENDED_COFF) $(TARGET).cof @echo $(MSG_EXTENDED_COFF) $(TARGET).cof
$(COFFCONVERT) -O coff-ext-avr $< $(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. # Create final output files (.hex, .eep) from ELF output file.
%.hex: %.elf %.hex: %.elf
@echo
@echo $(MSG_FLASH) $@ @echo $(MSG_FLASH) $@
$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@ $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@
%.eep: %.elf %.eep: %.elf
@echo
@echo $(MSG_EEPROM) $@ @echo $(MSG_EEPROM) $@
-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0 --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0
# Create extended listing file from ELF output file. # Create extended listing file from ELF output file.
%.lss: %.elf %.lss: %.elf
@echo
@echo $(MSG_EXTENDED_LISTING) $@ @echo $(MSG_EXTENDED_LISTING) $@
$(OBJDUMP) -h -S -z $< > $@ $(OBJDUMP) -h -S -z $< > $@
# Create a symbol table from ELF output file. # Create a symbol table from ELF output file.
%.sym: %.elf %.sym: %.elf
@echo
@echo $(MSG_SYMBOL_TABLE) $@ @echo $(MSG_SYMBOL_TABLE) $@
$(NM) -n $< > $@ $(NM) -n $< > $@
@ -547,7 +539,6 @@ extcoff: $(TARGET).elf
.SECONDARY : $(TARGET).a .SECONDARY : $(TARGET).a
.PRECIOUS : $(OBJ) .PRECIOUS : $(OBJ)
%.a: $(OBJ) %.a: $(OBJ)
@echo
@echo $(MSG_CREATING_LIBRARY) $@ @echo $(MSG_CREATING_LIBRARY) $@
$(AR) $@ $(OBJ) $(AR) $@ $(OBJ)
@ -556,14 +547,12 @@ extcoff: $(TARGET).elf
.SECONDARY : $(TARGET).elf .SECONDARY : $(TARGET).elf
.PRECIOUS : $(OBJ) .PRECIOUS : $(OBJ)
%.elf: $(OBJ) %.elf: $(OBJ)
@echo
@echo $(MSG_LINKING) $@ @echo $(MSG_LINKING) $@
$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS) $(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)
# Compile: create object files from C source files. # Compile: create object files from C source files.
$(OBJDIR)/%.o : %.c $(OBJDIR)/%.o : %.c
@echo
mkdir -p $(@D) mkdir -p $(@D)
@echo $(MSG_COMPILING) $< @echo $(MSG_COMPILING) $<
$(CC) -c $(ALL_CFLAGS) $< -o $@ $(CC) -c $(ALL_CFLAGS) $< -o $@
@ -571,7 +560,6 @@ $(OBJDIR)/%.o : %.c
# Compile: create object files from C++ source files. # Compile: create object files from C++ source files.
$(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.o : %.cpp
@echo
mkdir -p $(@D) mkdir -p $(@D)
@echo $(MSG_COMPILING_CPP) $< @echo $(MSG_COMPILING_CPP) $<
$(CC) -c $(ALL_CPPFLAGS) $< -o $@ $(CC) -c $(ALL_CPPFLAGS) $< -o $@
@ -589,7 +577,6 @@ $(OBJDIR)/%.o : %.cpp
# Assemble: create object files from assembler source files. # Assemble: create object files from assembler source files.
$(OBJDIR)/%.o : %.S $(OBJDIR)/%.o : %.S
@echo
mkdir -p $(@D) mkdir -p $(@D)
@echo $(MSG_ASSEMBLING) $< @echo $(MSG_ASSEMBLING) $<
$(CC) -c $(ALL_ASFLAGS) $< -o $@ $(CC) -c $(ALL_ASFLAGS) $< -o $@
@ -604,7 +591,6 @@ $(OBJDIR)/%.o : %.S
clean: begin clean_list end clean: begin clean_list end
clean_list : clean_list :
@echo
$(REMOVE) $(TARGET).hex $(REMOVE) $(TARGET).hex
$(REMOVE) $(TARGET).eep $(REMOVE) $(TARGET).eep
$(REMOVE) $(TARGET).cof $(REMOVE) $(TARGET).cof