diff options
author | Stephen Warren <swarren@nvidia.com> | 2018-02-21 17:13:50 -0700 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2018-03-01 09:45:10 -0700 |
commit | 6bc1a30ce6ef7633255aaa7b92286b2b14cd1b82 (patch) | |
tree | 5ff8c35c37f9ac18948e3354e5888299c18805e0 /make_helpers | |
parent | 4504ab2bc2c9a3c6db0f92e4a34fc6095766885b (diff) | |
download | trusted-firmware-a-6bc1a30ce6ef7633255aaa7b92286b2b14cd1b82.tar.gz |
Make all build results depend on all makefiles
This makes incremental builds work when the only change is to a definition
in a makefile. This version of the patch has been fixed to avoid depending
on the dependency makefiles that are generated at build time.
Fixes arm-software/tf-issues#551
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'make_helpers')
-rw-r--r-- | make_helpers/build_macros.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index a8650be08c..cac9dfc44b 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -199,7 +199,7 @@ $(eval OBJ := $(1)/$(patsubst %.c,%.o,$(notdir $(2)))) $(eval DEP := $(patsubst %.o,%.d,$(OBJ))) $(eval IMAGE := IMAGE_BL$(call uppercase,$(3))) -$(OBJ): $(2) | bl$(3)_dirs +$(OBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | bl$(3)_dirs @echo " CC $$<" $$(Q)$$(CC) $$(TF_CFLAGS) $$(CFLAGS) -D$(IMAGE) $(MAKE_DEP) -c $$< -o $$@ @@ -218,7 +218,7 @@ $(eval OBJ := $(1)/$(patsubst %.S,%.o,$(notdir $(2)))) $(eval DEP := $(patsubst %.o,%.d,$(OBJ))) $(eval IMAGE := IMAGE_BL$(call uppercase,$(3))) -$(OBJ): $(2) | bl$(3)_dirs +$(OBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | bl$(3)_dirs @echo " AS $$<" $$(Q)$$(AS) $$(ASFLAGS) -D$(IMAGE) $(MAKE_DEP) -c $$< -o $$@ @@ -235,7 +235,7 @@ define MAKE_LD $(eval DEP := $(1).d) -$(1): $(2) | bl$(3)_dirs +$(1): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | bl$(3)_dirs @echo " PP $$<" $$(Q)$$(CPP) $$(CPPFLAGS) -P -D__ASSEMBLY__ -D__LINKER__ $(MAKE_DEP) -o $$@ $$< @@ -374,7 +374,7 @@ define MAKE_DTB $(eval DOBJ := $(addprefix $(1)/,$(call SOURCES_TO_DTBS,$(2)))) $(eval DEP := $(patsubst %.dtb,%.d,$(DOBJ))) -$(DOBJ): $(2) | fdt_dirs +$(DOBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | fdt_dirs @echo " DTC $$<" $$(Q)$$(DTC) $$(DTC_FLAGS) -d $(DEP) -o $$@ $$< |