浏览代码

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.
Fred Sundvik 9 年之前
父节点
当前提交
8f16403179
共有 1 个文件被更改,包括 13 次插入9 次删除
  1. 13 9
      build_keyboard.mk

+ 13 - 9
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