From 800ec55dfca06b4630acf62cbb5f130c4031e4f1 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
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/converter/usb_usb/README.md |  2 +-
 keyboards/converter/usb_usb/rules.mk  | 29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'keyboards/converter/usb_usb')

diff --git a/keyboards/converter/usb_usb/README.md b/keyboards/converter/usb_usb/README.md
index c1904a8122..2ed702695b 100644
--- a/keyboards/converter/usb_usb/README.md
+++ b/keyboards/converter/usb_usb/README.md
@@ -9,7 +9,7 @@ Hardware Availability: [GH thread](https://geekhack.org/index.php?topic=72052.0)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make converter-usb_usb-default
+    make converter/usb_usb:default
 
 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.
 
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 4ee6cdb1ce..81a393e8ab 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -1,5 +1,5 @@
 # MCU name
-MCU ?= atmega32u4
+MCU = atmega32u4
 
 
 # Processor frequency.
@@ -13,14 +13,14 @@ MCU ?= atmega32u4
 #     does not *change* the processor frequency - it should merely be updated to
 #     reflect the processor speed set externally so that the code can use accurate
 #     software delays.
-F_CPU ?= 8000000
+F_CPU = 8000000
 
 
 #
 # LUFA specific
 #
 # Target architecture (see library "Board Types" documentation).
-ARCH ?= AVR8
+ARCH = AVR8
 
 # Input clock frequency.
 #     This will define a symbol, F_USB, in all source code files equal to the
@@ -33,7 +33,7 @@ ARCH ?= AVR8
 #
 #     If no clock division is performed on the input clock inside the AVR (via the
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB ?= $(F_CPU)
+F_USB = $(F_CPU)
 
 # Interrupt driven control endpoint task
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
@@ -51,16 +51,15 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
-# BOOTMAGIC_ENABLE	?= yes	# Virtual DIP switch configuration(+1000)
-# MOUSEKEY_ENABLE		?= yes	# Mouse keys(+4700)
-EXTRAKEY_ENABLE		?= yes	# Audio control and System control(+450)
-# CONSOLE_ENABLE		?= yes	# Console for debug(+400)
-# COMMAND_ENABLE		?= yes  # Commands for debug and configuration
-# SLEEP_LED_ENABLE ?= yes  # Breathing sleep LED during USB suspend
-# NKRO_ENABLE ?= yes	# USB Nkey Rollover - not yet supported in LUFA
-# BACKLIGHT_ENABLE ?= yes
-
+# BOOTMAGIC_ENABLE	= yes	# Virtual DIP switch configuration(+1000)
+# MOUSEKEY_ENABLE		= yes	# Mouse keys(+4700)
+EXTRAKEY_ENABLE		= yes	# Audio control and System control(+450)
+# CONSOLE_ENABLE		= yes	# Console for debug(+400)
+# COMMAND_ENABLE		= yes  # Commands for debug and configuration
+# SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+# NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
+# BACKLIGHT_ENABLE = yes
+USB_HID_ENABLE = yes
 
 CUSTOM_MATRIX = yes
-SRC = custom_matrix.cpp
-include $(TMK_DIR)/protocol/usb_hid.mk
+SRC = custom_matrix.cpp
\ No newline at end of file
-- 
cgit v1.2.3