X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=a6c3ee35b7a715a8e7f8d369b6dac1ac7c480a7f;hb=d686c0ea43d6a9db7768da64ee54c3ba25c018f7;hp=c7dda23dc6f5fdea98f118f27a8455b23e07aa13;hpb=6172273c866637c06150647cacf1477d8c8075c9;p=qmk_firmware.git diff --git a/Makefile b/Makefile index c7dda23dc..a6c3ee35b 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,6 @@ $(eval $(call GET_KEYBOARDS)) .PHONY: list-keyboards list-keyboards: echo $(KEYBOARDS) - exit 0 define PRINT_KEYBOARD $(info $(PRINTING_KEYBOARD)) @@ -124,16 +123,18 @@ endef .PHONY: generate-keyboards-file generate-keyboards-file: $(foreach PRINTING_KEYBOARD,$(KEYBOARDS),$(eval $(call PRINT_KEYBOARD))) - exit 0 .PHONY: clean clean: - echo 'Deleting .build/ ...' + echo -n 'Deleting .build/ ... ' rm -rf $(BUILD_DIR) - echo 'Deleting *.bin and *.hex ...' + echo 'done.' + +.PHONY: distclean +distclean: clean + echo -n 'Deleting *.bin and *.hex ... ' rm -f *.bin *.hex - echo 'Done.' - exit 0 + echo 'done.' #Compatibility with the old make variables, anything you specify directly on the command line # always overrides the detected folders @@ -533,11 +534,13 @@ endef %: # Check if we have the CMP tool installed cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; + # Ensure that python3 is installed. This check can be removed after python is used in more places. + if ! python3 --version 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; fi # Check if the submodules are dirty, and display a warning if they are ifndef SKIP_GIT - if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --init lib/chibios; fi - if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --init lib/chibios-contrib; fi - if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --init lib/ugfx; fi + if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 1 --init lib/chibios; fi + if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --depth 1 --init lib/chibios-contrib; fi + if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --depth 1 --init lib/ugfx; fi git submodule status --recursive 2>/dev/null | \ while IFS= read -r x; do \ case "$$x" in \