X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=macway%2FMakefile;h=83d31b67476bf6fad5ed027de224ce0dddf78cb0;hb=63d82fcaeb78d0764f39667b937262ed4a692c17;hp=49dba6746a34f2143f0ac7b870a70ff7baf57d82;hpb=6b0c939d72c11e404f84c926cf82f9501f8511ff;p=max%2Ftmk_keyboard.git

diff --git a/macway/Makefile b/macway/Makefile
index 49dba674..83d31b67 100644
--- a/macway/Makefile
+++ b/macway/Makefile
@@ -1,56 +1,19 @@
-# Hey Emacs, this is a -*- makefile -*-
-#----------------------------------------------------------------------------
-# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.
-#
-# Released to the Public Domain
-#
-# Additional material for this makefile was written by:
-# Peter Fleury
-# Tim Henigan
-# Colin O'Flynn
-# Reiner Patommel
-# Markus Pfaff
-# Sander Pool
-# Frederik Rouleau
-# Carlos Lamas
-#
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device, using avrdude.
-#                Please customize the avrdude settings below first!
-#
-# make debug = Start either simulavr or avarice as specified for debugging, 
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-
 # Target file name (without extension).
-TARGET = tmk_macway
+TARGET = macway
 
 # Directory common source filess exist
-COMMON_DIR = ..
+TOP_DIR = ..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
 # keyboard dependent files
-TARGET_SRC =	keymap.c \
-  	        matrix.c
+SRC =	main.c \
+	keymap.c \
+	matrix.c \
+	led.c
+
+CONFIG_H = config.h
 
 
 # MCU name, you MUST set this to match the board you are using
@@ -73,9 +36,18 @@ F_CPU = 16000000
 #   comment out to disable the options.
 #
 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
+#PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+#NKRO_ENABLE = yes	# USB Nkey Rollover
+
+
+
+#---------------- Programming Options --------------------------
+PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
+
 
 
-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