di0ib
/
tmk_keyboard
Watch 1
Star 0
Fork 0
Code Releases 4 Activity
Browse Source

Fixed Makefile to adjust new directories.

tags/v1.9
tmk 12 years ago
parent
f412570739
commit
63d82fcaeb
21 changed files with 84 additions and 53 deletions
Unified View Show Diff Stats
  1. 5
    3
      adb_usb/Makefile
  2. 1
    4
      common.mk
  3. 0
    0
      common/mousekey.c
  4. 5
    3
      hbk/Makefile
  5. 6
    4
      hhkb/Makefile.iwrap
  6. 5
    3
      hhkb/Makefile.pjrc
  7. 5
    3
      hhkb/Makefile.vusb
  8. 0
    0
      hhkb/doc/Bluetooth_img/BT_circuit.jpg
  9. 5
    3
      m0110_usb/Makefile
  10. 5
    3
      macway/Makefile
  11. 1
    1
      protocol/iwrap.mk
  12. 1
    1
      protocol/pjrc.mk
  13. 1
    1
      protocol/vusb.mk
  14. 5
    3
      ps2_usb/Makefile
  15. 5
    3
      ps2_usb/Makefile.pjrc_usart
  16. 5
    3
      ps2_usb/Makefile.vusb
  17. 9
    3
      rules.mk
  18. 5
    3
      sony_usb/Makefile.pjrc
  19. 5
    3
      terminal_usb/Makefile.102_pjrc
  20. 5
    3
      terminal_usb/Makefile.122_pjrc
  21. 5
    3
      x68k_usb/Makefile

+ 5
- 3
adb_usb/Makefile View File

TARGET = adb_usb TARGET = adb_usb


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 1
- 4
common.mk View File

endif endif


# Search Path # Search Path
VPATH += $(COMMON_DIR)


include $(COMMON_DIR)/rules.mk
VPATH += $(TOP_DIR)/common

+ 0
- 0
common/mousekey.c View File


+ 5
- 3
hbk/Makefile View File

TARGET = hbk TARGET = hbk


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 6
- 4
hhkb/Makefile.iwrap View File

TARGET = hhkb_iwrap TARGET = hhkb_iwrap


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH = $(TARGET_DIR)


include $(COMMON_DIR)/iwrap.mk
include $(TOP_DIR)/protocol/iwrap.mk
# To be swatchable btween Bluetooth and USB. Comment out if you don't need USB. # To be swatchable btween Bluetooth and USB. Comment out if you don't need USB.
include $(COMMON_DIR)/vusb.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/vusb.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 5
- 3
hhkb/Makefile.pjrc View File

TARGET = hhkb_pjrc TARGET = hhkb_pjrc


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH = $(TARGET_DIR)


include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 5
- 3
hhkb/Makefile.vusb View File

TARGET = hhkb_vusb TARGET = hhkb_vusb


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH = $(TARGET_DIR)


include $(COMMON_DIR)/vusb.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/vusb.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 0
- 0
hhkb/doc/Bluetooth_img/BT_circuit.jpg View File


+ 5
- 3
m0110_usb/Makefile View File

TARGET = m0110 TARGET = m0110


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk


hasu: EXTRAFLAGS += -DHASU hasu: EXTRAFLAGS += -DHASU
hasu: all hasu: all

+ 5
- 3
macway/Makefile View File

TARGET = macway TARGET = macway


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 1
- 1
protocol/iwrap.mk View File





# Search Path # Search Path
VPATH += $(COMMON_DIR)/iwrap
VPATH += $(TOP_DIR)/protocol/iwrap

+ 1
- 1
protocol/pjrc.mk View File





# Search Path # Search Path
VPATH += $(COMMON_DIR):$(COMMON_DIR)/pjrc
VPATH += $(TOP_DIR)/protocol/pjrc




# Option modules # Option modules

+ 1
- 1
protocol/vusb.mk View File





# Search Path # Search Path
VPATH += $(COMMON_DIR)/vusb:$(COMMON_DIR)/vusb/usbdrv
VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv

+ 5
- 3
ps2_usb/Makefile View File

TARGET = ps2_usb_pjrc TARGET = ps2_usb_pjrc


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 5
- 3
ps2_usb/Makefile.pjrc_usart View File

TARGET = ps2_usb_pjrc_usart TARGET = ps2_usb_pjrc_usart


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 5
- 3
ps2_usb/Makefile.vusb View File

TARGET = ps2_usb_vusb TARGET = ps2_usb_vusb


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/vusb.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/vusb.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 9
- 3
rules.mk View File

CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
CFLAGS += $(CSTANDARD) CFLAGS += $(CSTANDARD)
CFLAGS += -include $(CONFIG_H)
ifdef CONFIG_H
CFLAGS += -include $(CONFIG_H)
endif




#---------------- Compiler Options C++ ---------------- #---------------- Compiler Options C++ ----------------
CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
#CPPFLAGS += $(CSTANDARD) #CPPFLAGS += $(CSTANDARD)
CPPFLAGS += -include $(CONFIG_H)
ifdef CONFIG_H
CPPFLAGS += -include $(CONFIG_H)
endif




#---------------- Assembler Options ---------------- #---------------- Assembler Options ----------------
# -listing-cont-lines: Sets the maximum number of continuation lines of hex # -listing-cont-lines: Sets the maximum number of continuation lines of hex
# dump that will be displayed for a given single line of source input. # dump that will be displayed for a given single line of source input.
ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
ASFLAGS += -include $(CONFIG_H)
ifdef CONFIG_H
ASFLAGS += -include $(CONFIG_H)
endif




#---------------- Library Options ---------------- #---------------- Library Options ----------------

+ 5
- 3
sony_usb/Makefile.pjrc View File

TARGET = news_usb_pjrc TARGET = news_usb_pjrc


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 5
- 3
terminal_usb/Makefile.102_pjrc View File

TARGET = terminal_usb_102_pjrc TARGET = terminal_usb_102_pjrc


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 5
- 3
terminal_usb/Makefile.122_pjrc View File

TARGET = terminal_usb_122_pjrc TARGET = terminal_usb_122_pjrc


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

+ 5
- 3
x68k_usb/Makefile View File

TARGET = x68k_usb_pjrc TARGET = x68k_usb_pjrc


# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = ..
TOP_DIR = ..


# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .






include $(COMMON_DIR)/pjrc.mk
include $(COMMON_DIR)/common.mk
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

Write Preview
Loading…
Cancel
Save