Browse Source

Migrate makefile utilities to sub-directory (#14917)

master
Joel Challis 10 months ago
committed by GitHub
parent
commit
b780c797be
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      Makefile
  2. 13
      build_keyboard.mk
  3. 5
      build_test.mk
  4. 0
      builddefs/bootloader.mk
  5. 0
      builddefs/disable_features.mk
  6. 0
      builddefs/generic_features.mk
  7. 0
      builddefs/mcu_selection.mk
  8. 0
      builddefs/message.mk
  9. 0
      builddefs/show_options.mk
  10. 5
      paths.mk

3
Makefile

@ -425,7 +425,8 @@ define SET_SILENT_MODE
endif
endef
include $(ROOT_DIR)/message.mk
include paths.mk
include $(BUILDDEFS_PATH)/message.mk
ifeq ($(strip $(BREAK_ON_ERRORS)), yes)
HANDLE_ERROR = exit 1

13
build_keyboard.mk

@ -10,7 +10,8 @@ endif
.DEFAULT_GOAL := all
include common.mk
include paths.mk
include $(BUILDDEFS_PATH)/message.mk
# Set the qmk cli to use
QMK_BIN ?= qmk
@ -164,7 +165,7 @@ ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
include platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk
endif
include quantum/mcu_selection.mk
include $(BUILDDEFS_PATH)/mcu_selection.mk
# Find all the C source files to be compiled in subfolders.
KEYBOARD_SRC :=
@ -342,7 +343,7 @@ ifneq ("$(wildcard $(USER_PATH)/post_config.h)","")
endif
# Disable features that a keyboard doesn't support
-include disable_features.mk
-include $(BUILDDEFS_PATH)/disable_features.mk
# Pull in post_rules.mk files from all our subfolders
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
@ -385,10 +386,10 @@ VPATH += $(KEYBOARD_PATHS)
VPATH += $(COMMON_VPATH)
include common_features.mk
include generic_features.mk
include $(BUILDDEFS_PATH)/generic_features.mk
include $(TMK_PATH)/protocol.mk
include $(TMK_PATH)/common.mk
include bootloader.mk
include $(BUILDDEFS_PATH)/bootloader.mk
SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
@ -445,7 +446,7 @@ check-size: build
check-md5: build
objs-size: build
include show_options.mk
include $(BUILDDEFS_PATH)/show_options.mk
include $(TMK_PATH)/rules.mk
# Ensure we have generated files available for each of the objects

5
build_test.mk

@ -4,7 +4,8 @@ endif
.DEFAULT_GOAL := all
include common.mk
include paths.mk
include $(BUILDDEFS_PATH)/message.mk
TARGET=test/$(TEST)
@ -52,7 +53,7 @@ include tests/$(TEST)/rules.mk
endif
include common_features.mk
include generic_features.mk
include $(BUILDDEFS_PATH)/generic_features.mk
include $(TMK_PATH)/common.mk
include $(QUANTUM_PATH)/debounce/tests/rules.mk
include $(QUANTUM_PATH)/sequencer/tests/rules.mk

0
bootloader.mk → builddefs/bootloader.mk

0
disable_features.mk → builddefs/disable_features.mk

0
generic_features.mk → builddefs/generic_features.mk

0
quantum/mcu_selection.mk → builddefs/mcu_selection.mk

0
message.mk → builddefs/message.mk

0
show_options.mk → builddefs/show_options.mk

5
common.mk → paths.mk

@ -1,5 +1,3 @@
include message.mk
# Directory common source files exist
TOP_DIR = .
TMK_DIR = tmk_core
@ -15,6 +13,9 @@ DRIVER_PATH = $(DRIVER_DIR)
PLATFORM_DIR = platforms
PLATFORM_PATH = $(PLATFORM_DIR)
BUILDDEFS_DIR = builddefs
BUILDDEFS_PATH = $(BUILDDEFS_DIR)
BUILD_DIR := .build
COMMON_VPATH := $(TOP_DIR)
Loading…
Cancel
Save