From 4873eb6f5c79f3637b209888b7ddb51d66abbfb6 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sun, 1 Apr 2012 11:55:25 +0200 Subject: gbuild: do not let generated source files depend on headers (ver. 2) --- solenv/gbuild/LinkTarget.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index a217086061d4..746ddfababfa 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -745,8 +745,11 @@ define gb_LinkTarget_add_generated_c_object $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2) +# Make just needs to know gb_GenCObject_get_source is a real target. +# Then it can use implicit rule for gb_GenCObject_get_target. +$(call gb_GenCObject_get_source,$(2)) : | $(gb_Helper_MISCDUMMY) $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCObject_get_target,$(2)) -$(call gb_GenCObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) +$(call gb_GenCObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) $(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(3) $(call gb_GenCObject_get_target,$(2)) : \ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) @@ -762,8 +765,11 @@ define gb_LinkTarget_add_generated_cxx_object $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2) +# Make just needs to know gb_GenCxxObject_get_source is a real target. +# Then it can use implicit rule for gb_GenCxxObject_get_target. +$(call gb_GenCxxObject_get_source,$(2)) : | $(gb_Helper_MISCDUMMY) $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2)) -$(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) +$(call gb_GenCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) $(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) $(call gb_GenCxxObject_get_target,$(2)) : \ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) -- cgit