forked from mirrors/qmk_userspace
		
	Migrate makefile utilities to sub-directory (#14917)
This commit is contained in:
		
					parent
					
						
							
								6c507afcf2
							
						
					
				
			
			
				commit
				
					
						b780c797be
					
				
			
		
					 10 changed files with 15 additions and 11 deletions
				
			
		
							
								
								
									
										3
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										3
									
								
								Makefile
									
										
									
									
									
								
							| 
						 | 
					@ -425,7 +425,8 @@ define SET_SILENT_MODE
 | 
				
			||||||
    endif
 | 
					    endif
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include $(ROOT_DIR)/message.mk
 | 
					include paths.mk
 | 
				
			||||||
 | 
					include $(BUILDDEFS_PATH)/message.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifeq ($(strip $(BREAK_ON_ERRORS)), yes)
 | 
					ifeq ($(strip $(BREAK_ON_ERRORS)), yes)
 | 
				
			||||||
HANDLE_ERROR = exit 1
 | 
					HANDLE_ERROR = exit 1
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,7 +10,8 @@ endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.DEFAULT_GOAL := all
 | 
					.DEFAULT_GOAL := all
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include common.mk
 | 
					include paths.mk
 | 
				
			||||||
 | 
					include $(BUILDDEFS_PATH)/message.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Set the qmk cli to use
 | 
					# Set the qmk cli to use
 | 
				
			||||||
QMK_BIN ?= qmk
 | 
					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
 | 
					    include platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include quantum/mcu_selection.mk
 | 
					include $(BUILDDEFS_PATH)/mcu_selection.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Find all the C source files to be compiled in subfolders.
 | 
					# Find all the C source files to be compiled in subfolders.
 | 
				
			||||||
KEYBOARD_SRC :=
 | 
					KEYBOARD_SRC :=
 | 
				
			||||||
| 
						 | 
					@ -342,7 +343,7 @@ ifneq ("$(wildcard $(USER_PATH)/post_config.h)","")
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Disable features that a keyboard doesn't support
 | 
					# 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
 | 
					# Pull in post_rules.mk files from all our subfolders
 | 
				
			||||||
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
 | 
					ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
 | 
				
			||||||
| 
						 | 
					@ -385,10 +386,10 @@ VPATH += $(KEYBOARD_PATHS)
 | 
				
			||||||
VPATH += $(COMMON_VPATH)
 | 
					VPATH += $(COMMON_VPATH)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include common_features.mk
 | 
					include common_features.mk
 | 
				
			||||||
include generic_features.mk
 | 
					include $(BUILDDEFS_PATH)/generic_features.mk
 | 
				
			||||||
include $(TMK_PATH)/protocol.mk
 | 
					include $(TMK_PATH)/protocol.mk
 | 
				
			||||||
include $(TMK_PATH)/common.mk
 | 
					include $(TMK_PATH)/common.mk
 | 
				
			||||||
include bootloader.mk
 | 
					include $(BUILDDEFS_PATH)/bootloader.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
 | 
					SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
 | 
				
			||||||
SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
 | 
					SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
 | 
				
			||||||
| 
						 | 
					@ -445,7 +446,7 @@ check-size: build
 | 
				
			||||||
check-md5: build
 | 
					check-md5: build
 | 
				
			||||||
objs-size: build
 | 
					objs-size: build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include show_options.mk
 | 
					include $(BUILDDEFS_PATH)/show_options.mk
 | 
				
			||||||
include $(TMK_PATH)/rules.mk
 | 
					include $(TMK_PATH)/rules.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Ensure we have generated files available for each of the objects
 | 
					# Ensure we have generated files available for each of the objects
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,8 @@ endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.DEFAULT_GOAL := all
 | 
					.DEFAULT_GOAL := all
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include common.mk
 | 
					include paths.mk
 | 
				
			||||||
 | 
					include $(BUILDDEFS_PATH)/message.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TARGET=test/$(TEST)
 | 
					TARGET=test/$(TEST)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,7 +53,7 @@ include tests/$(TEST)/rules.mk
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include common_features.mk
 | 
					include common_features.mk
 | 
				
			||||||
include generic_features.mk
 | 
					include $(BUILDDEFS_PATH)/generic_features.mk
 | 
				
			||||||
include $(TMK_PATH)/common.mk
 | 
					include $(TMK_PATH)/common.mk
 | 
				
			||||||
include $(QUANTUM_PATH)/debounce/tests/rules.mk
 | 
					include $(QUANTUM_PATH)/debounce/tests/rules.mk
 | 
				
			||||||
include $(QUANTUM_PATH)/sequencer/tests/rules.mk
 | 
					include $(QUANTUM_PATH)/sequencer/tests/rules.mk
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,3 @@
 | 
				
			||||||
include message.mk
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Directory common source files exist
 | 
					# Directory common source files exist
 | 
				
			||||||
TOP_DIR = .
 | 
					TOP_DIR = .
 | 
				
			||||||
TMK_DIR = tmk_core
 | 
					TMK_DIR = tmk_core
 | 
				
			||||||
| 
						 | 
					@ -15,6 +13,9 @@ DRIVER_PATH = $(DRIVER_DIR)
 | 
				
			||||||
PLATFORM_DIR = platforms
 | 
					PLATFORM_DIR = platforms
 | 
				
			||||||
PLATFORM_PATH = $(PLATFORM_DIR)
 | 
					PLATFORM_PATH = $(PLATFORM_DIR)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					BUILDDEFS_DIR = builddefs
 | 
				
			||||||
 | 
					BUILDDEFS_PATH = $(BUILDDEFS_DIR)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
BUILD_DIR := .build
 | 
					BUILD_DIR := .build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COMMON_VPATH := $(TOP_DIR)
 | 
					COMMON_VPATH := $(TOP_DIR)
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue