Kaydet (Commit) 8d08ebb6 authored tarafından David Tardon's avatar David Tardon

drop 'private' from variable defs.

Apparently make 3.81 is confused by using private target-specific
simply-expanded variable (i.e., initialized with ':='), which in this
case leads to

/<builddir>/scp2/InstallModule_accessories.mk:30: *** multiple target patterns.  Stop.

Recursively-expanded variable works fine....

Anyway, it was just an idea. It seems the time is not ripe for it yet.

Change-Id: Ic5582d809530256cad087c3c4fd10f9641d24cbd
üst b411b87e
......@@ -105,7 +105,7 @@ $(call gb_ScpPreprocessTarget_get_clean_target,%) :
# gb_ScpPreprocessTarget_ScpPreprocessTarget(<target>)
define gb_ScpPreprocessTarget_ScpPreprocessTarget
$(call gb_ScpPreprocessTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_source,$(1))
$(call gb_ScpPreprocessTarget_get_target,$(1)) : SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_source,$(1))
$(call gb_ScpPreprocessTarget_get_target,$(1)) : $(call gb_ScpPreprocessTarget_get_source,$(1))
$(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(dir $(call gb_ScpPreprocessTarget_get_target,$(1))).dir
......@@ -138,7 +138,7 @@ $(call gb_ScpMergeTarget_get_clean_target,%) :
# gb_ScpMergeTarget_ScpMergeTarget(<target>)
define gb_ScpMergeTarget_ScpMergeTarget
$(call gb_ScpMergeTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1))
$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1))
$(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1))
$(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir
$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))localize.sdf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment