solenv/gbuild/InstallModuleTarget.mk | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
New commits: commit 6ed5e4fe91ecb3bdac7eb2bf070139cfb12867c4 Author: David Tardon <[email protected]> Date: Tue Sep 25 16:28:01 2012 +0200 add missing dep on cpp.lcc Change-Id: I3e86ce3ebafd2347164e484d060086beae05430b diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 34c32a9..53e97e9 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -74,24 +74,27 @@ endef # ScpPreprocessTarget class +gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp.lcc) +gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET) + gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp define gb_ScpPreprocessTarget__command $(call gb_Output_announce,$(2),$(true),SPP,2) $(call gb_Helper_abbreviate_dirs,\ - $(call gb_Helper_execute,cpp.lcc) \ + $(gb_ScpPreprocessTarget_COMMAND) \ -+ -P \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ - $(3) > $(1) \ + $(SCP_SOURCE) > $(1) \ ) endef $(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -$(call gb_ScpPreprocessTarget_get_target,%) : - $(call gb_ScpPreprocessTarget__command,$@,$*,$<) +$(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_TARGET) + $(call gb_ScpPreprocessTarget__command,$@,$*) .PHONY : $(call gb_ScpPreprocessTarget_get_clean_target,%) $(call gb_ScpPreprocessTarget_get_clean_target,%) : @@ -100,6 +103,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)) : $(call gb_ScpPreprocessTarget_get_source,$(1)) $(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(dir $(call gb_ScpPreprocessTarget_get_target,$(1))).dir commit 52807a0daac358ca2472b851070653cdcf3a246f Author: David Tardon <[email protected]> Date: Tue Sep 25 16:23:19 2012 +0200 fix scp2 build producing garbage Change-Id: Ia295528fea995c5660f9d50c0426d79d60900ebd diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 8e63132..34c32a9 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -115,7 +115,7 @@ gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf define gb_ScpMergeTarget__command $(call gb_Output_announce,$(2),$(true),SUM,1) $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $(SCP_SDF) -l all \ + $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(SCP_SOURCE) -o $(1) -m $(SCP_SDF) -l all \ ) endef @@ -123,7 +123,7 @@ $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET) - $(call gb_ScpMergeTarget__command,$@,$*,$<) + $(call gb_ScpMergeTarget__command,$@,$*) .PHONY : $(call gb_ScpMergeTarget_get_clean_target,%) $(call gb_ScpMergeTarget_get_clean_target,%) : @@ -132,6 +132,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)) : $(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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
