forked from mfulz_github/qmk_firmware
Add OBJDIR optional build variable to the BULD build system module, to allow the user project to relocate the output object and dependency files to a different directory.
This commit is contained in:
parent
fe3a5c2462
commit
9ab445518a
|
@ -23,7 +23,9 @@ ifeq ($(MAKELEVEL), 10)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
ifeq ($(OBJDIR),)
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
||||||
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
||||||
|
|
|
@ -23,7 +23,9 @@ ifeq ($(MAKELEVEL), 10)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
ifeq ($(OBJDIR),)
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
||||||
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
||||||
|
|
|
@ -23,7 +23,9 @@ ifeq ($(MAKELEVEL), 10)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
ifeq ($(OBJDIR),)
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
||||||
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
||||||
|
|
|
@ -23,7 +23,9 @@ ifeq ($(MAKELEVEL), 10)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
ifeq ($(OBJDIR),)
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
||||||
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
||||||
|
|
|
@ -23,7 +23,9 @@ ifeq ($(MAKELEVEL), 10)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
ifeq ($(OBJDIR),)
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
||||||
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
||||||
|
|
|
@ -23,7 +23,9 @@ ifeq ($(MAKELEVEL), 10)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
ifeq ($(OBJDIR),)
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
||||||
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
LUFA_BUILD_MODULES += BUILD
|
LUFA_BUILD_MODULES += BUILD
|
||||||
LUFA_BUILD_TARGETS += size symbol-sizes all elf hex lss clean
|
LUFA_BUILD_TARGETS += size symbol-sizes all elf hex lss clean
|
||||||
LUFA_BUILD_MANDATORY_VARS += TARGET ARCH MCU SRC F_USB LUFA_PATH
|
LUFA_BUILD_MANDATORY_VARS += TARGET ARCH MCU SRC F_USB LUFA_PATH
|
||||||
LUFA_BUILD_OPTIONAL_VARS += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_FLAGS CPP_FLAGS ASM_FLAGS CC_FLAGS LD_FLAGS
|
LUFA_BUILD_OPTIONAL_VARS += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_FLAGS CPP_FLAGS ASM_FLAGS CC_FLAGS LD_FLAGS OBJDIR
|
||||||
LUFA_BUILD_PROVIDED_VARS +=
|
LUFA_BUILD_PROVIDED_VARS +=
|
||||||
LUFA_BUILD_PROVIDED_MACROS +=
|
LUFA_BUILD_PROVIDED_MACROS +=
|
||||||
|
|
||||||
|
@ -54,6 +54,9 @@ LUFA_BUILD_PROVIDED_MACROS +=
|
||||||
# CC_FLAGS - Common flags to pass to the C/C++ compiler and
|
# CC_FLAGS - Common flags to pass to the C/C++ compiler and
|
||||||
# assembler
|
# assembler
|
||||||
# LD_FLAGS - Flags to pass to the linker
|
# LD_FLAGS - Flags to pass to the linker
|
||||||
|
# OBJDIR - Directory for the output object and dependency
|
||||||
|
# files; if equal to ".", the output files will
|
||||||
|
# be generated in the same folder as the sources
|
||||||
#
|
#
|
||||||
# PROVIDED VARIABLES:
|
# PROVIDED VARIABLES:
|
||||||
#
|
#
|
||||||
|
@ -79,6 +82,7 @@ C_FLAGS ?=
|
||||||
CPP_FLAGS ?=
|
CPP_FLAGS ?=
|
||||||
ASM_FLAGS ?=
|
ASM_FLAGS ?=
|
||||||
CC_FLAGS ?=
|
CC_FLAGS ?=
|
||||||
|
OBJDIR ?= .
|
||||||
|
|
||||||
# Sanity check user supplied values
|
# Sanity check user supplied values
|
||||||
$(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
|
$(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
|
||||||
|
@ -91,6 +95,7 @@ $(call ERROR_IF_EMPTY, BOARD)
|
||||||
$(call ERROR_IF_EMPTY, OPTIMIZATION)
|
$(call ERROR_IF_EMPTY, OPTIMIZATION)
|
||||||
$(call ERROR_IF_EMPTY, C_STANDARD)
|
$(call ERROR_IF_EMPTY, C_STANDARD)
|
||||||
$(call ERROR_IF_EMPTY, CPP_STANDARD)
|
$(call ERROR_IF_EMPTY, CPP_STANDARD)
|
||||||
|
$(call ERROR_IF_EMPTY, OBJDIR)
|
||||||
|
|
||||||
# Determine the utility prefix to use for the selected architecture
|
# Determine the utility prefix to use for the selected architecture
|
||||||
ifeq ($(ARCH), AVR8)
|
ifeq ($(ARCH), AVR8)
|
||||||
|
@ -129,7 +134,14 @@ ifneq ($(UNKNOWN_SOURCE),)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Convert input source filenames into a list of required output object files
|
# Convert input source filenames into a list of required output object files
|
||||||
OBJECT_FILES = $(filter %.o, $(C_SOURCE:%.c=%.o) $(CPP_SOURCE:%.cpp=%.o) $(ASM_SOURCE:%.S=%.o))
|
OBJECT_FILES = $(filter %.o, $(C_SOURCE:%.c=%.o) $(CPP_SOURCE:%.cpp=%.o) $(ASM_SOURCE:%.S=%.o))
|
||||||
|
ifneq ($(OBJDIR),.)
|
||||||
|
$(shell mkdir $(OBJDIR) 2>&1 | /dev/null)
|
||||||
|
VPATH += $(dir $(SRC))
|
||||||
|
|
||||||
|
OBJECT_FILES := $(addprefix $(patsubst %/,%,$(OBJDIR))/, $(notdir $(OBJECT_FILES)))
|
||||||
|
endif
|
||||||
|
|
||||||
DEPENDENCY_FILES = $(OBJECT_FILES:%.o=%.d)
|
DEPENDENCY_FILES = $(OBJECT_FILES:%.o=%.d)
|
||||||
|
|
||||||
# Create a list of common flags to pass to the compiler/linker/assembler
|
# Create a list of common flags to pass to the compiler/linker/assembler
|
||||||
|
@ -211,15 +223,15 @@ elf: $(TARGET).elf
|
||||||
hex: $(TARGET).hex $(TARGET).eep
|
hex: $(TARGET).hex $(TARGET).eep
|
||||||
lss: $(TARGET).lss
|
lss: $(TARGET).lss
|
||||||
|
|
||||||
%.o: %.c $(MAKEFILE_LIST)
|
$(OBJDIR)/%.o: %.c $(MAKEFILE_LIST)
|
||||||
@echo $(MSG_COMPILE_CMD) Compiling C file \"$<\"
|
@echo $(MSG_COMPILE_CMD) Compiling C file \"$<\"
|
||||||
$(CROSS)gcc -c $(BASE_CC_FLAGS) $(BASE_C_FLAGS) $(CC_FLAGS) $(C_FLAGS) -MMD -MP -MF $(@:%.o=%.d) $< -o $@
|
$(CROSS)gcc -c $(BASE_CC_FLAGS) $(BASE_C_FLAGS) $(CC_FLAGS) $(C_FLAGS) -MMD -MP -MF $(@:%.o=%.d) $< -o $@
|
||||||
|
|
||||||
%.o: %.cpp $(MAKEFILE_LIST)
|
$(OBJDIR)/%.o: %.cpp $(MAKEFILE_LIST)
|
||||||
@echo $(MSG_COMPILE_CMD) Compiling C++ file \"$<\"
|
@echo $(MSG_COMPILE_CMD) Compiling C++ file \"$<\"
|
||||||
$(CROSS)gcc -c $(BASE_CC_FLAGS) $(BASE_CPP_FLAGS) $(CC_FLAGS) $(CPP_FLAGS) -MMD -MP -MF $(@:%.o=%.d) $< -o $@
|
$(CROSS)gcc -c $(BASE_CC_FLAGS) $(BASE_CPP_FLAGS) $(CC_FLAGS) $(CPP_FLAGS) -MMD -MP -MF $(@:%.o=%.d) $< -o $@
|
||||||
|
|
||||||
%.o: %.S $(MAKEFILE_LIST)
|
$(OBJDIR)/%.o: %.S $(MAKEFILE_LIST)
|
||||||
@echo $(MSG_ASSEMBLE_CMD) Assembling \"$<\"
|
@echo $(MSG_ASSEMBLE_CMD) Assembling \"$<\"
|
||||||
$(CROSS)gcc -c $(BASE_CC_FLAGS) $(BASE_ASM_FLAGS) $(CC_FLAGS) $(ASM_FLAGS) $< -o $@
|
$(CROSS)gcc -c $(BASE_CC_FLAGS) $(BASE_ASM_FLAGS) $(CC_FLAGS) $(ASM_FLAGS) $< -o $@
|
||||||
|
|
||||||
|
|
|
@ -162,6 +162,11 @@
|
||||||
* <td><tt>LD_FLAGS</tt></td>
|
* <td><tt>LD_FLAGS</tt></td>
|
||||||
* <td>Flags to pass to the linker, after the automatically generated flags.</td>
|
* <td>Flags to pass to the linker, after the automatically generated flags.</td>
|
||||||
* </tr>
|
* </tr>
|
||||||
|
* <tr>
|
||||||
|
* <td><tt>OBJDIR</tt></td>
|
||||||
|
* <td>Directory to place the generated object and dependency files. If set to "." the same folder as the source file will be used.
|
||||||
|
* \note When this option is enabled, all source filenames must be unique.</td>
|
||||||
|
* </tr>
|
||||||
* </table>
|
* </table>
|
||||||
*
|
*
|
||||||
* \section SSec_BuildModule_BUILD_ProvideVariables Module Provided Variables
|
* \section SSec_BuildModule_BUILD_ProvideVariables Module Provided Variables
|
||||||
|
|
|
@ -23,7 +23,9 @@ ifeq ($(MAKELEVEL), 10)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
ifeq ($(OBJDIR),)
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
|
||||||
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
|
||||||
|
|
Loading…
Reference in New Issue