lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[make] Fixup dependencies for modules included by EXTRA_BUILDRULES

Browse Source 
Move statement that sets DEPS make variable a bit later in engine.mk
execution flow (after including make/build.mk) so that it would include
modules added through EXTRA_BUILDRULES mechanism.

Change-Id: I5c7a02eaf272f009a81ac9868f378b9baa23faae
This commit is contained in:
Michael Ryleev
2015-08-10 11:58:07 -07:00
committed by Travis Geiselbrecht
parent 14de7b0168
commit 42694e06e6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
engine.mk
View File

@@ -166,7 +166,6 @@ GLOBAL_DEFINES += $(EXTERNAL_DEFINES)
$(info EXTERNAL_DEFINES = $(EXTERNAL_DEFINES))
endif
DEPS := $(ALLOBJS:%o=%d)
# prefix all of the paths in GLOBAL_INCLUDES with -I
GLOBAL_INCLUDES := $(addprefix -I,$(GLOBAL_INCLUDES))
@@ -196,6 +195,8 @@ export GCC_COLORS ?= 1
# the logic to compile and link stuff is in here
include make/build.mk
DEPS := $(ALLOBJS:%o=%d)
# put all of the global build flags in config.h to force a rebuild if any change
GLOBAL_DEFINES += GLOBAL_INCLUDES=\"$(subst $(SPACE),_,$(GLOBAL_INCLUDES))\"
GLOBAL_DEFINES += GLOBAL_COMPILEFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_COMPILEFLAGS))\"