From 8f16403179dde51af1826fbc9b65ce0e29fd33ad Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sun, 21 Aug 2016 13:53:36 +0300
Subject: [PATCH] Change order of variable assignment
BUILD_DIR and TARGET was assigned too late, so the dfu-util target,
which depends on them did not work.
---
build_keyboard.mk | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/build_keyboard.mk b/build_keyboard.mk
index e8d8f3572b7..a2a2871e6e4 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -16,6 +16,19 @@ LIB_PATH = $(TOP_DIR)/lib
QUANTUM_DIR = quantum
QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR)
+BUILD_DIR := $(TOP_DIR)/.build
+
+ifneq ($(SUBPROJECT),)
+ TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP)
+ KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT)
+else
+ TARGET ?= $(KEYBOARD)_$(KEYMAP)
+ KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)
+endif
+
+# Force expansion
+TARGET := $(TARGET)
+
MASTER ?= left
ifdef master
@@ -93,15 +106,6 @@ else
$(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist)
endif
-BUILD_DIR = $(TOP_DIR)/.build
-
-ifneq ($(SUBPROJECT),)
- TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP)
- KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT)
-else
- TARGET ?= $(KEYBOARD)_$(KEYMAP)
- KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)
-endif
# Object files directory
# To put object files in current directory, use a dot (.), do NOT make