Skip to content

Commit

Permalink
Migrate makefile utilities to sub-directory (#14917)
Browse files Browse the repository at this point in the history
  • Loading branch information
zvecr authored Oct 28, 2021
1 parent 6c507af commit b780c79
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 11 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions build_keyboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 :=
Expand Down Expand Up @@ -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)","")
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions build_test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ endif

.DEFAULT_GOAL := all

include common.mk
include paths.mk
include $(BUILDDEFS_PATH)/message.mk

TARGET=test/$(TEST)

Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 3 additions & 2 deletions common.mk → paths.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include message.mk

# Directory common source files exist
TOP_DIR = .
TMK_DIR = tmk_core
Expand All @@ -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)
Expand Down

0 comments on commit b780c79

Please sign in to comment.