X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=9ef82bbd3c2e0b02c2ce91faf89e7a886bb781ea;hb=57fdce91bf8f932de794a16c1e7df5143df38db9;hp=87a3f4993c8532884e5193e7f4ddb70c8d103449;hpb=800ec55dfca06b4630acf62cbb5f130c4031e4f1;p=qmk_firmware.git diff --git a/Makefile b/Makefile index 87a3f4993..9ef82bbd3 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,12 @@ endif # Otherwise the [OK], [ERROR] and [WARN] messages won't be displayed correctly override SILENT := false +ifndef SUB_IS_SILENT QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null) ifneq ($(QMK_VERSION),) $(info QMK Firmware $(QMK_VERSION)) endif +endif ON_ERROR := error_occurred=1 @@ -114,6 +116,20 @@ list-keyboards: echo $(KEYBOARDS) exit 0 +define PRINT_KEYBOARD + $(info $(PRINTING_KEYBOARD)) +endef + +generate-keyboards-file: + $(foreach PRINTING_KEYBOARD,$(KEYBOARDS),$(eval $(call PRINT_KEYBOARD))) + exit 0 + +clean: + echo -n 'Deleting .build ... ' + rm -rf $(BUILD_DIR) + echo 'done' + exit 0 + #Compatibility with the old make variables, anything you specify directly on the command line # always overrides the detected folders ifdef keyboard @@ -304,7 +320,8 @@ define PARSE_KEYBOARD KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.))) KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.))) KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.))) - KEYMAPS := $$(sort $$(filter-out $$(KEYBOARD_FOLDER_1) $$(KEYBOARD_FOLDER_2) \ + # this might be needed, but in a different form + #KEYMAPS := $$(sort $$(filter-out $$(KEYBOARD_FOLDER_1) $$(KEYBOARD_FOLDER_2) \ $$(KEYBOARD_FOLDER_3) $$(KEYBOARD_FOLDER_4) $$(KEYBOARD_FOLDER_5), $$(KEYMAPS))) KEYBOARD_LAYOUTS :=