core: Clean up code of Locking key support

[max/tmk_keyboard.git] / keyboard / hhkb / Makefile

diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 89d05ba1598eea22f0deb15eac9e17fc00a26592..c9027535a13f33fc5f4608a7facf9d50c5dad8ba 100644 (file)
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -39,34 +39,28 @@
 #----------------------------------------------------------------------------
 
 # Target file name (without extension).
-TARGET = hhkb_lufa
+TARGET ?= hhkb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR ?= ../../tmk_core
 
 # Directory keyboard dependent files exist
-TARGET_DIR = .
+TARGET_DIR ?= .
 
 
 # List C source files here. (C dependencies are automatically generated.)
-SRC += keymap_common.c \
-       matrix.c \
+SRC ?= matrix.c \
        led.c
 
-ifdef KEYMAP
-    SRC := keymap_$(KEYMAP).c $(SRC)
+ifeq (yes,$(strip $(RN42_ENABLE)))
+CONFIG_H ?= config_rn42.h
 else
-    SRC := keymap_hasu.c $(SRC)
+CONFIG_H ?= config.h
 endif
 
-CONFIG_H = config.h
-
 
 # MCU name
-# PJRC Teensy++ 2.0
-#MCU = at90usb1286
-# TMK Alt Controller or PJRC Teensy 2.0
-MCU = atmega32u4
+MCU ?= atmega32u4
 
 # Processor frequency.
 #     This will define a symbol, F_CPU, in all source code files equal to the
@@ -79,14 +73,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 = 16000000
+F_CPU ?= 16000000
 
 
 #
 # 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
@@ -99,7 +93,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
@@ -117,25 +111,65 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes         # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = yes           # Console for debug
-COMMAND_ENABLE = yes           # Commands for debug and configuration
-NKRO_ENABLE = yes              # USB Nkey Rollover
-KEYMAP_SECTION_ENABLE = yes    # fixed address keymap for keymap editor
+#BOOTMAGIC_ENABLE ?= yes       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE ?= yes         # Mouse keys
+EXTRAKEY_ENABLE ?= yes         # Audio control and System control
+CONSOLE_ENABLE ?= yes          # Console for debug
+COMMAND_ENABLE ?= yes          # Commands for debug and configuration
+NKRO_ENABLE ?= yes             # USB Nkey Rollover
+#HHKB_JP ?= yes                        # HHKB JP support
+#UNIMAP_ENABLE ?= yes          # Universal keymap
+#ACTIONMAP_ENABLE ?= yes       # Use 16bit actionmap instead of 8bit keymap
+#KEYMAP_SECTION_ENABLE ?= yes  # fixed address keymap for keymap editor
+
+#OPT_DEFS += -DNO_ACTION_TAPPING
+#OPT_DEFS += -DNO_ACTION_LAYER
+#OPT_DEFS += -DNO_ACTION_MACRO
+
+
+#
+# Keymap file
+#
+ifeq (yes,$(strip $(UNIMAP_ENABLE)))
+    KEYMAP_FILE = unimap
+else
+    ifeq (yes,$(strip $(ACTIONMAP_ENABLE)))
+        KEYMAP_FILE = actionmap
+    else
+        KEYMAP_FILE = keymap
+    endif
+endif
+ifdef KEYMAP
+    SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
+else
+    ifeq (yes,$(strip $(HHKB_JP)))
+        SRC := $(KEYMAP_FILE)_jp.c $(SRC)
+    else 
+        SRC := $(KEYMAP_FILE)_hhkb.c $(SRC)
+    endif
+endif
+
+
+ifneq (, $(or $(findstring keymap_jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
+    OPT_DEFS += -DHHKB_JP
+endif
 
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+ifeq (yes,$(strip $(RN42_ENABLE)))
+include rn42.mk
+include $(TMK_DIR)/protocol.mk
+endif
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
 debug-on: all
 
 debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
+debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
 debug-off: all