summaryrefslogtreecommitdiff
path: root/keyboard/hhkb/Makefile.pjrc
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2012-06-30 14:56:24 +0900
committertmk <nobody@nowhere>2012-06-30 14:56:24 +0900
commitfca518f90dfc7f72132ff7950b000cfbd5709807 (patch)
tree1c61e7b91f1f4986232a1fdca421b3346f8a9431 /keyboard/hhkb/Makefile.pjrc
parent76033dcd892a115240c5a990e5643cd53acbca87 (diff)
parent2769f09d11a4c45362f2e6137f2469d057d8757e (diff)
Merge branch 'lufa'
Diffstat (limited to 'keyboard/hhkb/Makefile.pjrc')
-rw-r--r--keyboard/hhkb/Makefile.pjrc7
1 files changed, 3 insertions, 4 deletions
diff --git a/keyboard/hhkb/Makefile.pjrc b/keyboard/hhkb/Makefile.pjrc
index f6d133eae4..f8836a2ca1 100644
--- a/keyboard/hhkb/Makefile.pjrc
+++ b/keyboard/hhkb/Makefile.pjrc
@@ -13,12 +13,11 @@ TOP_DIR = ../..
TARGET_DIR = .
# keyboard dependent files
-SRC = main.c \
- keymap.c \
+SRC = keymap.c \
matrix.c \
led.c
-CONFIG_H = config_pjrc.h
+CONFIG_H = config.h
# MCU name, you MUST set this to match the board you are using
@@ -53,8 +52,8 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path
VPATH = $(TARGET_DIR)
+VPATH = $(TOP_DIR)
include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk