aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-05-28 15:33:08 -0400
committerJack Humbert <jack.humb@gmail.com>2016-05-28 15:33:08 -0400
commita53bc24c4d5a6b1f31060e43789a12af6e39b572 (patch)
tree0f1d01fd79f3aa8e4d59b6a30c1f0ba4aa3b865a
parent17977a7e24ddab6ca101341b33c8fe7ad13e68f5 (diff)
downloadqmk_firmware-a53bc24c4d5a6b1f31060e43789a12af6e39b572.tar.gz
qmk_firmware-a53bc24c4d5a6b1f31060e43789a12af6e39b572.zip
makes .SILENT (less verbose) by default - override with VERBOSE=1
also took out some @echo newlines to make things a bit cleaner
-rw-r--r--quantum/quantum.mk4
-rw-r--r--tmk_core/rules.mk14
2 files changed, 4 insertions, 14 deletions
diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index c099d6793..00d3e8114 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -1,5 +1,9 @@
1QUANTUM_DIR = quantum 1QUANTUM_DIR = quantum
2 2
3ifndef VERBOSE
4.SILENT:
5endif
6
3# # project specific files 7# # project specific files
4SRC += $(QUANTUM_DIR)/quantum.c \ 8SRC += $(QUANTUM_DIR)/quantum.c \
5 $(QUANTUM_DIR)/keymap_common.c \ 9 $(QUANTUM_DIR)/keymap_common.c \
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 1d384574f..37be850f8 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -393,12 +393,10 @@ lib: $(LIBNAME)
393# AVR Studio 3.x does not check make's exit code but relies on 393# AVR Studio 3.x does not check make's exit code but relies on
394# the following magic strings to be generated by the compile job. 394# the following magic strings to be generated by the compile job.
395begin: 395begin:
396 @echo
397 @echo $(MSG_BEGIN) 396 @echo $(MSG_BEGIN)
398 397
399end: 398end:
400 @echo $(MSG_END) 399 @echo $(MSG_END)
401 @echo
402 400
403 401
404# Display size of file. 402# Display size of file.
@@ -505,13 +503,11 @@ COFFCONVERT += --change-section-address .eeprom-0x810000
505 503
506 504
507coff: $(TARGET).elf 505coff: $(TARGET).elf
508 @echo
509 @echo $(MSG_COFF) $(TARGET).cof 506 @echo $(MSG_COFF) $(TARGET).cof
510 $(COFFCONVERT) -O coff-avr $< $(TARGET).cof 507 $(COFFCONVERT) -O coff-avr $< $(TARGET).cof
511 508
512 509
513extcoff: $(TARGET).elf 510extcoff: $(TARGET).elf
514 @echo
515 @echo $(MSG_EXTENDED_COFF) $(TARGET).cof 511 @echo $(MSG_EXTENDED_COFF) $(TARGET).cof
516 $(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof 512 $(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof
517 513
@@ -519,25 +515,21 @@ extcoff: $(TARGET).elf
519 515
520# Create final output files (.hex, .eep) from ELF output file. 516# Create final output files (.hex, .eep) from ELF output file.
521%.hex: %.elf 517%.hex: %.elf
522 @echo
523 @echo $(MSG_FLASH) $@ 518 @echo $(MSG_FLASH) $@
524 $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@ 519 $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@
525 520
526%.eep: %.elf 521%.eep: %.elf
527 @echo
528 @echo $(MSG_EEPROM) $@ 522 @echo $(MSG_EEPROM) $@
529 -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ 523 -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
530 --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0 524 --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0
531 525
532# Create extended listing file from ELF output file. 526# Create extended listing file from ELF output file.
533%.lss: %.elf 527%.lss: %.elf
534 @echo
535 @echo $(MSG_EXTENDED_LISTING) $@ 528 @echo $(MSG_EXTENDED_LISTING) $@
536 $(OBJDUMP) -h -S -z $< > $@ 529 $(OBJDUMP) -h -S -z $< > $@
537 530
538# Create a symbol table from ELF output file. 531# Create a symbol table from ELF output file.
539%.sym: %.elf 532%.sym: %.elf
540 @echo
541 @echo $(MSG_SYMBOL_TABLE) $@ 533 @echo $(MSG_SYMBOL_TABLE) $@
542 $(NM) -n $< > $@ 534 $(NM) -n $< > $@
543 535
@@ -547,7 +539,6 @@ extcoff: $(TARGET).elf
547.SECONDARY : $(TARGET).a 539.SECONDARY : $(TARGET).a
548.PRECIOUS : $(OBJ) 540.PRECIOUS : $(OBJ)
549%.a: $(OBJ) 541%.a: $(OBJ)
550 @echo
551 @echo $(MSG_CREATING_LIBRARY) $@ 542 @echo $(MSG_CREATING_LIBRARY) $@
552 $(AR) $@ $(OBJ) 543 $(AR) $@ $(OBJ)
553 544
@@ -556,14 +547,12 @@ extcoff: $(TARGET).elf
556.SECONDARY : $(TARGET).elf 547.SECONDARY : $(TARGET).elf
557.PRECIOUS : $(OBJ) 548.PRECIOUS : $(OBJ)
558%.elf: $(OBJ) 549%.elf: $(OBJ)
559 @echo
560 @echo $(MSG_LINKING) $@ 550 @echo $(MSG_LINKING) $@
561 $(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS) 551 $(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)
562 552
563 553
564# Compile: create object files from C source files. 554# Compile: create object files from C source files.
565$(OBJDIR)/%.o : %.c 555$(OBJDIR)/%.o : %.c
566 @echo
567 mkdir -p $(@D) 556 mkdir -p $(@D)
568 @echo $(MSG_COMPILING) $< 557 @echo $(MSG_COMPILING) $<
569 $(CC) -c $(ALL_CFLAGS) $< -o $@ 558 $(CC) -c $(ALL_CFLAGS) $< -o $@
@@ -571,7 +560,6 @@ $(OBJDIR)/%.o : %.c
571 560
572# Compile: create object files from C++ source files. 561# Compile: create object files from C++ source files.
573$(OBJDIR)/%.o : %.cpp 562$(OBJDIR)/%.o : %.cpp
574 @echo
575 mkdir -p $(@D) 563 mkdir -p $(@D)
576 @echo $(MSG_COMPILING_CPP) $< 564 @echo $(MSG_COMPILING_CPP) $<
577 $(CC) -c $(ALL_CPPFLAGS) $< -o $@ 565 $(CC) -c $(ALL_CPPFLAGS) $< -o $@
@@ -589,7 +577,6 @@ $(OBJDIR)/%.o : %.cpp
589 577
590# Assemble: create object files from assembler source files. 578# Assemble: create object files from assembler source files.
591$(OBJDIR)/%.o : %.S 579$(OBJDIR)/%.o : %.S
592 @echo
593 mkdir -p $(@D) 580 mkdir -p $(@D)
594 @echo $(MSG_ASSEMBLING) $< 581 @echo $(MSG_ASSEMBLING) $<
595 $(CC) -c $(ALL_ASFLAGS) $< -o $@ 582 $(CC) -c $(ALL_ASFLAGS) $< -o $@
@@ -604,7 +591,6 @@ $(OBJDIR)/%.o : %.S
604clean: begin clean_list end 591clean: begin clean_list end
605 592
606clean_list : 593clean_list :
607 @echo
608 $(REMOVE) $(TARGET).hex 594 $(REMOVE) $(TARGET).hex
609 $(REMOVE) $(TARGET).eep 595 $(REMOVE) $(TARGET).eep
610 $(REMOVE) $(TARGET).cof 596 $(REMOVE) $(TARGET).cof