[Libreoffice-commits] .: 2 commits - solenv/gbuild

[David Tardon]

 solenv/gbuild/AllLangResTarget.mk |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 7c909dc4bbb225e8ce9376c9825d481a24acff56
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 29 09:57:18 2011 +0200

    do not announce if there is nothing to do

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 7034a4c..fe4f306 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -175,12 +175,12 @@ $(call gb_SrsTemplateTarget_get_target,%_last) :
 
 .PHONY : $(call gb_SrsTemplateTarget_get_target,%)
 $(call gb_SrsTemplateTarget_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),SRT,4)
+	$(if $(strip $(PARTS)),$(call gb_Output_announce,$*,$(true),SRT,4))
 	$(call gb_SrsTemplateTarget__command,$@)
 
 .PHONY : $(call gb_SrsTemplateTarget_get_clean_target,%)
 $(call gb_SrsTemplateTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),SRT,4)
+	$(if $(strip $(PARTS)),$(call gb_Output_announce,$*,$(false),SRT,4))
 	-$(call gb_Helper_abbreviate_dirs,\
 	    rm -f $(call gb_SrsTemplateTarget_get_target,$*) \
 		    $(call gb_SrsTemplateTarget__get_merged_target,$*) \
commit 888e39e999e718f54320f614ee2c62322a402db4
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 29 09:54:37 2011 +0200

    these targets are impl. details--do not announce

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 416032f..7034a4c 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -145,8 +145,14 @@ endef
 
 # SrsTemplateTarget class
 
-gb_SrsTemplateTarget__get_merged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_merged
-gb_SrsTemplateTarget__get_unmerged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_unmerged
+define gb_SrsTemplateTarget__command
+	$(call gb_Helper_abbreviate_dirs,\
+	    mkdir -p $(dir $(1)) && \
+	    touch $(1))
+endef
+
+gb_SrsTemplateTarget__get_merged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_merged_last
+gb_SrsTemplateTarget__get_unmerged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_unmerged_last
 
 ifeq ($(strip $(WITH_LANG)),)
 gb_SrsTemplateTarget__get_target = $(call gb_SrsTemplateTarget__get_unmerged_target,$(1))
@@ -163,12 +169,14 @@ $(call gb_SrsTemplateTarget_get_target,$(1)) : $(call gb_SrsTemplateTarget__get_
 $(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
 endef
 
+.PHONY : $(call gb_SrsTemplateTarget_get_target,%_last)
+$(call gb_SrsTemplateTarget_get_target,%_last) :
+	$(call gb_SrsTemplateTarget__command,$@)
+
 .PHONY : $(call gb_SrsTemplateTarget_get_target,%)
 $(call gb_SrsTemplateTarget_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),SRT,4)
-	$(call gb_Helper_abbreviate_dirs,\
-	    mkdir -p $(dir $@) && \
-	    touch $@)
+	$(call gb_SrsTemplateTarget__command,$@)
 
 .PHONY : $(call gb_SrsTemplateTarget_get_clean_target,%)
 $(call gb_SrsTemplateTarget_get_clean_target,%) :