diff options
| author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2019-05-03 22:20:23 +0900 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-05-03 06:20:23 -0700 |
| commit | 29f68459a01c155ca64aed4ec0ba083d0dee0d2e (patch) | |
| tree | 9e38fd7707db426b1ccd38e55f7cbd44cccc3df5 | |
| parent | 6a59198a42d49422297ee9320e5d842592573297 (diff) | |
| download | qmk_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.
| -rw-r--r-- | build_keyboard.mk | 2 |
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)","") | |||
| 324 | endif | 324 | endif |
| 325 | 325 | ||
| 326 | # # project specific files | 326 | # # project specific files |
| 327 | SRC += $(patsubst %.c,%.clib,$(LIB_SRC)) | ||
| 328 | SRC += $(KEYBOARD_SRC) \ | 327 | SRC += $(KEYBOARD_SRC) \ |
| 329 | $(KEYMAP_C) \ | 328 | $(KEYMAP_C) \ |
| 330 | $(QUANTUM_SRC) | 329 | $(QUANTUM_SRC) |
| @@ -343,6 +342,7 @@ include $(TMK_PATH)/protocol.mk | |||
| 343 | include $(TMK_PATH)/common.mk | 342 | include $(TMK_PATH)/common.mk |
| 344 | include bootloader.mk | 343 | include bootloader.mk |
| 345 | 344 | ||
| 345 | SRC += $(patsubst %.c,%.clib,$(LIB_SRC)) | ||
| 346 | SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC)) | 346 | SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC)) |
| 347 | SRC += $(TMK_COMMON_SRC) | 347 | SRC += $(TMK_COMMON_SRC) |
| 348 | OPT_DEFS += $(TMK_COMMON_DEFS) | 348 | OPT_DEFS += $(TMK_COMMON_DEFS) |