aboutsummaryrefslogtreecommitdiff
path: root/build_keyboard.mk
diff options
context:
space:
mode:
authorTakeshi ISHII <2170248+mtei@users.noreply.github.com>2019-05-03 22:20:23 +0900
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-05-03 06:20:23 -0700
commit29f68459a01c155ca64aed4ec0ba083d0dee0d2e (patch)
tree9e38fd7707db426b1ccd38e55f7cbd44cccc3df5 /build_keyboard.mk
parent6a59198a42d49422297ee9320e5d842592573297 (diff)
downloadqmk_firmware-29f68459a01c155ca64aed4ec0ba083d0dee0d2e.tar.gz
qmk_firmware-29f68459a01c155ca64aed4ec0ba083d0dee0d2e.zip
Fix LIB_SRC insert position (#5731)
The insertion point for `$(patsubst %.c,%.clib,$(LIB_SRC))` must be after all normal `SRC += ..` . I modified it to be so. Because LIB_SRC and SRC are assumed to be used in pairs. Similarly, QUANTUM_LIB_SRC and QUANTUM_SRC are assumed to be used in pairs.
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r--build_keyboard.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 510923ebe..213cb4445 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -324,7 +324,6 @@ ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
324endif 324endif
325 325
326# # project specific files 326# # project specific files
327SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
328SRC += $(KEYBOARD_SRC) \ 327SRC += $(KEYBOARD_SRC) \
329 $(KEYMAP_C) \ 328 $(KEYMAP_C) \
330 $(QUANTUM_SRC) 329 $(QUANTUM_SRC)
@@ -343,6 +342,7 @@ include $(TMK_PATH)/protocol.mk
343include $(TMK_PATH)/common.mk 342include $(TMK_PATH)/common.mk
344include bootloader.mk 343include bootloader.mk
345 344
345SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
346SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC)) 346SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
347SRC += $(TMK_COMMON_SRC) 347SRC += $(TMK_COMMON_SRC)
348OPT_DEFS += $(TMK_COMMON_DEFS) 348OPT_DEFS += $(TMK_COMMON_DEFS)