diff options
author | skullydazed <[email protected]> | 2018-01-28 11:11:28 -0800 |
---|---|---|
committer | GitHub <[email protected]> | 2018-01-28 11:11:28 -0800 |
commit | 9bfaf66792310fae2d525633b280b354babca026 (patch) | |
tree | 16e801302a9adfa6fcacb3ab16d1244b52ca0200 /tmk_core/rules.mk | |
parent | f0f991dd89733b7dc9ca54042923c031b3b3ca73 (diff) | |
download | qmk_firmware-9bfaf66792310fae2d525633b280b354babca026.tar.gz qmk_firmware-9bfaf66792310fae2d525633b280b354babca026.zip |
Always copy the firmware file to the root qmk_firmware directory (#2314)0.5.218
* Always copy the firmware file to the root qmk_firmware directory
* remove circular dependency
Diffstat (limited to 'tmk_core/rules.mk')
-rw-r--r-- | tmk_core/rules.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 920a7f6add..7a282caccd 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -216,9 +216,9 @@ MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@) elf: $(BUILD_DIR)/$(TARGET).elf hex: $(BUILD_DIR)/$(TARGET).hex -cphex: hex - $(SILENT) || printf "Copying $(TARGET).hex to qmk_firmware folder" | $(AWK_CMD) - $(COPY) $(BUILD_DIR)/$(TARGET).hex $(TARGET).hex && $(PRINT_OK) +cpfirmware: $(FIRMWARE_FORMAT) + $(SILENT) || printf "Copying $(TARGET).$(FIRMWARE_FORMAT) to qmk_firmware folder" | $(AWK_CMD) + $(COPY) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT) $(TARGET).$(FIRMWARE_FORMAT) && $(PRINT_OK) eep: $(BUILD_DIR)/$(TARGET).eep lss: $(BUILD_DIR)/$(TARGET).lss sym: $(BUILD_DIR)/$(TARGET).sym @@ -392,4 +392,4 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null))) .PHONY : all finish sizebefore sizeafter qmkversion \ gccversion 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 +program teensy dfu flip dfu-ee flip-ee dfu-start |