Fixed Makefile to adjust new directories.

[max/tmk_keyboard.git] / macway / Makefile

diff --git a/macway/Makefile b/macway/Makefile
index c603ca7b98540d30520347b4d8146749240fe854..83d31b67476bf6fad5ed027de224ce0dddf78cb0 100644 (file)
--- a/macway/Makefile
+++ b/macway/Makefile
@@ -2,16 +2,16 @@
 TARGET = macway
 
 # Directory common source filess exist
-COMMON_DIR = ..
+TOP_DIR = ..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
 # keyboard dependent files
-TARGET_SRC =   main_pjrc.c \
-               keymap.c \
-               matrix.c \
-               led.c
+SRC =  main.c \
+       keymap.c \
+       matrix.c \
+       led.c
 
 CONFIG_H = config.h
 
@@ -37,15 +37,17 @@ F_CPU = 16000000
 #
 MOUSEKEY_ENABLE = yes  # Mouse keys
 #PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
-USB_EXTRA_ENABLE = yes # Enhanced feature for Windows(Audio control and System control)
-#USB_NKRO_ENABLE = yes # USB Nkey Rollover
+EXTRAKEY_ENABLE = yes  # Audio control and System control
+#NKRO_ENABLE = yes     # USB Nkey Rollover
 
 
 
 #---------------- Programming Options --------------------------
-PROGRAM_CMD = teensy_loader_cli.exe -mmcu=$(MCU) -w -v $(TARGET).hex
+PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
 
-include $(COMMON_DIR)/Makefile.pjrc
-include $(COMMON_DIR)/Makefile.common
+include $(TOP_DIR)/protocol/pjrc.mk
+include $(TOP_DIR)/protocol.mk
+include $(TOP_DIR)/common.mk
+include $(TOP_DIR)/rules.mk