X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fhhkb%2FMakefile;h=2ba1786cc1e93e39aa82f4a289c51ae507adcd17;hb=d96f295106d5f2360fed9c912226377d3b7684c0;hp=4bbfdb805d9da67f4b239fad359ad56d2a3cfe69;hpb=6bc7bab6a53a7fb78e0ab1d5989de3a6c9efce4f;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 4bbfdb80..2ba1786c 100644
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -39,7 +39,7 @@
 #----------------------------------------------------------------------------
 
 # Target file name (without extension).
-TARGET ?= hhkb_lufa
+TARGET ?= hhkb
 
 # Directory common source filess exist
 TMK_DIR ?= ../../tmk_core
@@ -52,13 +52,14 @@ TARGET_DIR ?= .
 SRC ?=	matrix.c \
 	led.c
 
+ifeq (yes,$(strip $(RN42_ENABLE)))
+CONFIG_H ?= config_rn42.h
+else
 CONFIG_H ?= config.h
+endif
 
 
 # MCU name
-# PJRC Teensy++ 2.0
-#MCU = at90usb1286
-# TMK Alt Controller or PJRC Teensy 2.0
 MCU ?= atmega32u4
 
 # Processor frequency.
@@ -110,17 +111,16 @@ 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
-#HHKB_JP = yes			# HHKB JP support
-#UNIMAP_ENABLE = yes
-#ACTIONMAP_ENABLE = yes         # Use 16bit actionmap instead of 8bit keymap
-#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
@@ -130,10 +130,10 @@ NKRO_ENABLE = yes		# USB Nkey Rollover
 #
 # Keymap file
 #
-ifdef UNIMAP_ENABLE
+ifeq (yes,$(strip $(UNIMAP_ENABLE)))
     KEYMAP_FILE = unimap
 else
-    ifdef ACTIONMAP_ENABLE
+    ifeq (yes,$(strip $(ACTIONMAP_ENABLE)))
         KEYMAP_FILE = actionmap
     else
         KEYMAP_FILE = keymap
@@ -142,7 +142,7 @@ endif
 ifdef KEYMAP
     SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
 else
-    ifdef HHKB_JP
+    ifeq (yes,$(strip $(HHKB_JP)))
         SRC := $(KEYMAP_FILE)_jp.c $(SRC)
     else 
         SRC := $(KEYMAP_FILE)_hhkb.c $(SRC)
@@ -159,6 +159,10 @@ endif
 VPATH += $(TARGET_DIR)
 VPATH += $(TMK_DIR)
 
+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