From 800ec55dfca06b4630acf62cbb5f130c4031e4f1 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 14 Oct 2017 11:32:19 -1000 Subject: Make arguments redo, subproject elimination (#1784) * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * start to update readmes and keyboards * look in keyboard directories for board.mk * update visualizer rules * fix up some other keyboards/keymaps * fix arm board ld includes * fix board rules * fix up remaining keyboards * reset layout variable * reset keyboard_layouts * fix remainging keymaps/boards * update readmes, docs * add note to makefile error * update readmes * remove planck keymap warnings * update references and docs * test out tarvis build stages * don't use stages for now * don't use stages for now --- keyboards/eco/eco.h | 4 ++-- keyboards/eco/readme.md | 2 +- keyboards/eco/rules.mk | 2 ++ keyboards/eco/subproject.mk | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 keyboards/eco/subproject.mk (limited to 'keyboards/eco') diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h index 2cfb8df26..4f8cfabd8 100644 --- a/keyboards/eco/eco.h +++ b/keyboards/eco/eco.h @@ -1,10 +1,10 @@ #ifndef ECO_H #define ECO_H -#ifdef SUBPROJECT_rev1 +#ifdef KEYBOARD_eco_rev1 #include "rev1.h" #endif -#ifdef SUBPROJECT_rev2 +#ifdef KEYBOARD_eco_rev2 #include "rev2.h" #endif diff --git a/keyboards/eco/readme.md b/keyboards/eco/readme.md index d29aa8ece..afa9d5559 100644 --- a/keyboards/eco/readme.md +++ b/keyboards/eco/readme.md @@ -10,6 +10,6 @@ Hardware Supported: ECO PCB rev1 Pro Micro Make example for this keyboard (after setting up your build environment): - make eco-rev2-that_canadian + make eco/rev2:that_canadian See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. \ No newline at end of file diff --git a/keyboards/eco/rules.mk b/keyboards/eco/rules.mk index cf26cdc0d..6f4b4fefc 100644 --- a/keyboards/eco/rules.mk +++ b/keyboards/eco/rules.mk @@ -66,3 +66,5 @@ API_SYSEX_ENABLE = no # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +DEFAULT_FOLDER = eco/rev2 \ No newline at end of file diff --git a/keyboards/eco/subproject.mk b/keyboards/eco/subproject.mk deleted file mode 100644 index 7c9b39598..000000000 --- a/keyboards/eco/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev2 -- cgit v1.2.3-24-g4f1b