diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-08 11:19:29 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-08-20 03:56:32 +0300 |
| commit | 60c6e79ecb032e9726809a295ab3e0011e6b2fb4 (patch) | |
| tree | 5166aafae25c204321c136d995be948c85a0d720 /tmk_core | |
| parent | cc2df445ab3b0fd3998de7861b1c9ba0ad64aa8a (diff) | |
| download | qmk_firmware-60c6e79ecb032e9726809a295ab3e0011e6b2fb4.tar.gz qmk_firmware-60c6e79ecb032e9726809a295ab3e0011e6b2fb4.zip | |
Move git submodule check and version generation to main Makefile
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/rules.mk | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 9aa4ac8cf8..e8e3de5719 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -267,15 +267,6 @@ sym: $(BUILD_DIR)/$(TARGET).sym LIBNAME=lib$(TARGET).a lib: $(LIBNAME) -check_submodule: - git submodule status --recursive | \ - while IFS= read -r x; do \ - case "$$x" in \ - \ *) ;; \ - *) printf "$(MSG_SUBMODULE_DIRTY)";break;; \ - esac \ - done - # Display size of file. HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex #ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf @@ -337,7 +328,7 @@ gccversion : $(eval CMD=$(AR) $@ $(OBJ) ) @$(BUILD_CMD) -BEGIN = gccversion check_submodule sizebefore +BEGIN = gccversion sizebefore # Link: create ELF output file from object files. .SECONDARY : $(BUILD_DIR)/$(TARGET).elf @@ -443,6 +434,6 @@ $(shell mkdir $(KBOBJDIR) 2>/dev/null) # Listing of phony targets. .PHONY : all finish sizebefore sizeafter gccversion \ -build elf hex eep lss sym coff extcoff check_submodule \ +build elf hex eep lss sym coff extcoff \ clean clean_list debug gdb-config show_path \ program teensy dfu flip dfu-ee flip-ee dfu-start
\ No newline at end of file |