diff options
| author | Stephen Tudor <smt@smt.io> | 2017-01-28 06:51:07 +0100 |
|---|---|---|
| committer | Stephen Tudor <smt@smt.io> | 2017-01-28 06:51:07 +0100 |
| commit | fa72689145ccbee120c236111c0e8813afa7881a (patch) | |
| tree | 7eb408d19987ad05c6156331e50d6921c82aea50 /Makefile | |
| parent | 63e406eca4da805617889f7ab769a781c0046742 (diff) | |
| parent | ec05f654210a01ef82db2ab54e6065783536b802 (diff) | |
| download | qmk_firmware-fa72689145ccbee120c236111c0e8813afa7881a.tar.gz qmk_firmware-fa72689145ccbee120c236111c0e8813afa7881a.tar.xz | |
Merge branch 'master' into smt/planck
* master:
Clarify license on abnt2 keymap (#1038)
replace jackhumbert with qmk
Add gitter image, start update to qmk org
Remove COLEMAK from preonic_keycodes enum
layer defines to enum
Update readme for smt Preonic keymap
Add smt keymap for Preonic
updated all the other keymaps to support the new changes.
fix: infinity60 keyboard was not using quantum features.
Compare Makefile with itself instead of using `--help`
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -487,7 +487,7 @@ $(SUBPROJECTS): %: %-allkm .PHONY: % %: # Check if we have the CMP tool installed - cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; + cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; # Check if the submodules are dirty, and display a warning if they are ifndef SKIP_GIT git submodule status --recursive 2>/dev/null | \ @@ -537,4 +537,4 @@ BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) -include $(ROOT_DIR)/testlist.mk
\ No newline at end of file +include $(ROOT_DIR)/testlist.mk |