[Libreoffice-commits] .: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/AllLangResTarget.mk |    2 +-
 solenv/gbuild/Configuration.mk    |    2 +-
 solenv/gbuild/Extension.mk        |    5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit aa11b4c86e4b41be542623b7d98a3fb8e5d30745
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 8 21:57:19 2012 +0100

    Properly rebuild files generated by l10ntools programs
    
    (Changing the corresponding build-order-only dependencies to proper ones should
    be safe here, as all mentions of $^ are within $(filter) calls.)

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 21570c7..635778d 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 
 endef
 
-$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)  $(gb_SrsPartMergeTarget_TRANSEXTARGET)
 	$(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p $(dir $@) && cp $< $@)
 
 
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 0674837..1743be4 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -238,7 +238,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-l all)
 endef
 
-$(call gb_XcuMergeTarget_get_target,%) : | $(gb_XcuMergeTarget_CFGEXTARGET)
+$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET)
 	$(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
 
 $(call gb_XcuMergeTarget_get_clean_target,%) :
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 5ee8a97..fc7708e 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -61,8 +61,7 @@ $(call gb_Extension_get_workdir,%)/description.xml :
 		mkdir -p $(call gb_Extension_get_workdir,$*) && \
 		cp -f $(LOCATION)/description.xml $@)
 else
-$(call gb_Extension_get_workdir,%)/description.xml : | \
-		$(gb_Extension_XRMEXTARGET)
+$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXTARGET)
 	$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
 ifeq ($(OS_FOR_BUILD),WNT)
 	$(call gb_Helper_abbreviate_dirs_native,\
@@ -168,7 +167,7 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2)
-$(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
+$(call gb_Extension_get_workdir,$(1))/$(2) : $(3) gb_Extension_HELPEXTARGET
 	$(call gb_Output_announce,$(2),$(true),XHP,3)
 	mkdir -p $$(dir $$@)
 ifeq ($(OS_FOR_BUILD),WNT)