diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-07-03 07:54:39 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-07-03 07:54:49 -0700 |
| commit | 110622eaa2787cc54818083d4243653b088e5b5a (patch) | |
| tree | b1637e4dc8d8aa13e9face4998cf25ae620361e5 /LUFA/Build/DMBS/DMBS/hid.mk | |
| parent | d0fd80affba97b37eb00c650e87cb5982a4f260e (diff) | |
| parent | 5ba628d10b54d58d445896290ba9799bd76a73b3 (diff) | |
| download | lufa-110622eaa2787cc54818083d4243653b088e5b5a.tar.gz lufa-110622eaa2787cc54818083d4243653b088e5b5a.tar.bz2 lufa-110622eaa2787cc54818083d4243653b088e5b5a.zip | |
Merge remote-tracking branch 'abcminiuser/master'
Diffstat (limited to 'LUFA/Build/DMBS/DMBS/hid.mk')
| -rw-r--r-- | LUFA/Build/DMBS/DMBS/hid.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/LUFA/Build/DMBS/DMBS/hid.mk b/LUFA/Build/DMBS/DMBS/hid.mk index 7a0ad9d0e..d3195b2ab 100644 --- a/LUFA/Build/DMBS/DMBS/hid.mk +++ b/LUFA/Build/DMBS/DMBS/hid.mk @@ -13,11 +13,9 @@ DMBS_BUILD_OPTIONAL_VARS += DMBS_BUILD_PROVIDED_VARS += DMBS_BUILD_PROVIDED_MACROS += -# Conditionally import the CORE module of DMBS if it is not already imported +# Import the CORE module of DMBS DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) -ifeq ($(findstring CORE, $(DMBS_BUILD_MODULES)),) - include $(DMBS_MODULE_PATH)/core.mk -endif +include $(DMBS_MODULE_PATH)/core.mk # Sanity-check values of mandatory user-supplied variables $(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR))) @@ -29,6 +27,9 @@ MSG_HID_BOOTLOADER_CMD := ' [HID] :' MSG_OBJCPY_CMD := ' [OBJCPY] :' MSG_MAKE_CMD := ' [MAKE] :' +# Set MAKE variable if the environment does not already define it +MAKE ?= make + # Programs in the target FLASH memory using the HID_BOOTLOADER_CLI tool hid: $(TARGET).hex $(MAKEFILE_LIST) @echo $(MSG_HID_BOOTLOADER_CMD) Programming FLASH with hid_bootloader_cli using \"$<\" |