janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 13:47:39 +01:00
Code Activity

defs.mk, platform.mk: Include pre-local.mk and cache.mk from platform.mk

Browse source 
platform.mk is sometimes included before defs.mk, e.g. from
$(TOPDIR)/make/proj.mk, then these definitions are necessary

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 09:56:11 +00:00
commit 59da607e12
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
make/defs.mk
View file

@ -7,19 +7,6 @@ JW_BUILD_DEF_MK_INCLUDED = true
MAKEFLAGS += -r MAKEFLAGS += -r
# "-include" tries search path, we don't want that
define try_include
ifneq ($$(wildcard $(1)),)
include $(1)
endif
endef
$(eval $(call try_include,$(MODDIR)/make/.cache.mk))
$(eval $(call try_include,$(TOPDIR)/make/.cache.mk))
$(eval $(call try_include,$(MODDIR)/make/pre-local.mk))
$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
$(eval $(call try_include,pre-local.mk))
include $(MODDIR)/make/projects.mk include $(MODDIR)/make/projects.mk
ifeq ($(MAKE_BENCHMARK),true) ifeq ($(MAKE_BENCHMARK),true)

13
make/platform.mk
View file

@ -3,6 +3,19 @@
ifndef PLATFORM_MK_INCLUDED ifndef PLATFORM_MK_INCLUDED
PLATFORM_MK_INCLUDED = true PLATFORM_MK_INCLUDED = true
# "-include" tries search path, we don't want that
define try_include
ifneq ($$(wildcard $(1)),)
include $(1)
endif
endef
$(eval $(call try_include,$(MODDIR)/make/.cache.mk))
$(eval $(call try_include,$(TOPDIR)/make/.cache.mk))
$(eval $(call try_include,$(MODDIR)/make/pre-local.mk))
$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
$(eval $(call try_include,pre-local.mk))
ifndef TARGET ifndef TARGET
ifneq ($(subst mingw,,$(CWD)),$(CWD)) ifneq ($(subst mingw,,$(CWD)),$(CWD))
TARGET := mingw TARGET := mingw