summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-01-12 12:50:14 -0800
committerZach White <skullydazed@drpepper.org>2021-01-13 16:01:21 -0800
commit3c8da5eba8f3e3f3d36fc2a531dd63998272f8ca (patch)
tree1080dbcab12ba51ba75bc2720eefd869b3b9ca65
parent70e143e0c1337cd952b763f643f3142b1c46951d (diff)
move the info.json rules above userspace
-rw-r--r--build_keyboard.mk40
1 files changed, 20 insertions, 20 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 9685d1f632..79fe336b48 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -273,26 +273,6 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
endif
-# Userspace setup and definitions
-ifeq ("$(USER_NAME)","")
- USER_NAME := $(KEYMAP)
-endif
-USER_PATH := users/$(USER_NAME)
-
--include $(USER_PATH)/rules.mk
-ifneq ("$(wildcard $(USER_PATH)/config.h)","")
- CONFIG_H += $(USER_PATH)/config.h
-endif
-
-# Object files directory
-# To put object files in current directory, use a dot (.), do NOT make
-# this an empty or blank macro!
-KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
-
-ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
- CONFIG_H += $(KEYMAP_PATH)/config.h
-endif
-
# Pull in stuff from info.json
INFO_JSON_FILES :=
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
@@ -323,6 +303,26 @@ generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/lay
.INTERMEDIATE : generated-files
+# Userspace setup and definitions
+ifeq ("$(USER_NAME)","")
+ USER_NAME := $(KEYMAP)
+endif
+USER_PATH := users/$(USER_NAME)
+
+-include $(USER_PATH)/rules.mk
+ifneq ("$(wildcard $(USER_PATH)/config.h)","")
+ CONFIG_H += $(USER_PATH)/config.h
+endif
+
+# Object files directory
+# To put object files in current directory, use a dot (.), do NOT make
+# this an empty or blank macro!
+KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
+
+ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
+ CONFIG_H += $(KEYMAP_PATH)/config.h
+endif
+
# project specific files
SRC += $(KEYBOARD_SRC) \
$(KEYMAP_C) \