summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-12-16 10:11:27 -0500
committermidipix <writeonce@midipix.org>2018-12-16 10:14:19 -0500
commit45423b672d0465c4111a683e495ddda911a9f12b (patch)
tree59512e3f93e483f15c271815f3379dff631338c5
parentc45ad1963d3e44644a6014cd0e518bed76dfb387 (diff)
downloadslibtool-45423b672d0465c4111a683e495ddda911a9f12b.tar.bz2
slibtool-45423b672d0465c4111a683e495ddda911a9f12b.tar.xz
build system: Makefile.in: include custom config defs before project files.
-rw-r--r--Makefile.in17
1 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in
index cc4e332..25a6a55 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,13 +119,20 @@ include $(PROJECT_DIR)/sysinfo/compiler/$(COMPILER).mk
include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk
include $(PROJECT_DIR)/sysinfo/os/$(OS).mk
-include $(PROJECT_DIR)/project/osforce.mk
+ifeq ($(USE_CUSTOM_CFGDEFS),yes)
+include ./cfgdefs.mk
+endif
+
+ifeq ($(USE_CUSTOM_USRDEFS),yes)
+include ./usrdefs.mk
+endif
include $(PROJECT_DIR)/sofort/defs.mk
include $(PROJECT_DIR)/sofort/version.mk
include $(PROJECT_DIR)/sofort/custom.mk
include $(PROJECT_DIR)/sofort/pkgconf.mk
+include $(PROJECT_DIR)/project/osforce.mk
include $(PROJECT_DIR)/project/tree.mk
include $(PROJECT_DIR)/project/depends.mk
include $(PROJECT_DIR)/project/headers.mk
@@ -134,14 +141,6 @@ include $(PROJECT_DIR)/project/arch.mk
include $(PROJECT_DIR)/project/extras.mk
include $(PROJECT_DIR)/project/overrides.mk
-ifeq ($(USE_CUSTOM_CFGDEFS),yes)
-include ./cfgdefs.mk
-endif
-
-ifeq ($(USE_CUSTOM_USRDEFS),yes)
-include ./usrdefs.mk
-endif
-
$(APP_SRCS:%.c=%.o): CFLAGS_STATIC = $(CFLAGS_APP)