summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-04-17 11:03:33 +0200
committerDavid Tardon <dtardon@redhat.com>2013-04-18 15:20:53 +0200
commit8531b8d015b1675d7af839728b121c500261d8fd (patch)
tree0f7cace4ef54740c2c0c4312e9abab94c1a585b0 /solenv
parent200f3df4e27f37ee7ef88745c359f3abc4cadbf9 (diff)
gbuild: use different announce strings for xcu stuff
Change-Id: I650c810c4034019fc8928a07b11dd9d1f949a927
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Configuration.mk20
1 files changed, 10 insertions, 10 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 578e809c32a2..5a169af74cd2 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -167,7 +167,7 @@ $(call gb_XcsTarget_get_outdir_target,$(basename $(subst -,.,$(basename $(1)))).
endef
define gb_XcuModuleTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,3)
+$(call gb_Output_announce,$(2),$(true),XCM,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \
@@ -184,7 +184,7 @@ $(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \
$(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^))
$(call gb_XcuModuleTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,3)
+ $(call gb_Output_announce,$*,$(false),XCM,3)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuModuleTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
@@ -202,7 +202,7 @@ gb_XcuLangpackTarget__get_target_with_lang = \
gb_XcuLangpackTarget_SED_delcomment := $(OUTDIR)/xml/processing/delcomment.sed
define gb_XcuLangpackTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,4)
+$(call gb_Output_announce,$(2),$(true),XCL,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
sed -e "s/__LANGUAGE__/$(LANG)/" -f $(gb_XcuLangpackTarget_SED_delcomment)\
@@ -214,7 +214,7 @@ $(call gb_XcuLangpackTarget_get_target,%) : \
$(call gb_XcuLangpackTarget__command,$@,$*,$(filter %.tmpl,$^))
$(call gb_XcuLangpackTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,4)
+ $(call gb_Output_announce,$*,$(false),XCL,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(foreach lang,$(gb_Configuration_LANGS),\
$(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
@@ -227,7 +227,7 @@ gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfg
gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
define gb_XcuMergeTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,5)
+$(call gb_Output_announce,$(2),$(true),XCX,1)
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(POFILES) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\
@@ -247,7 +247,7 @@ $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXDEPS)
mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
$(call gb_XcuMergeTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,5)
+ $(call gb_Output_announce,$*,$(false),XCX,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuMergeTarget_get_target,$*))
@@ -266,7 +266,7 @@ endef
# locale is extracted from the stem (parameter $(2))
define gb_XcuResTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,6)
+$(call gb_Output_announce,$(2),$(true),XCR,2)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \
@@ -284,7 +284,7 @@ $(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \
$(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
$(call gb_XcuResTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,6)
+ $(call gb_Output_announce,$*,$(false),XCR,2)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuResTarget_get_target,$*))
@@ -308,12 +308,12 @@ endef
# Configuration class
$(call gb_Configuration_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),CFG,1)
+ $(call gb_Output_announce,$*,$(false),CFG,4)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Configuration_get_target,$*) $(call gb_Configuration_get_preparation_target,$*))
$(call gb_Configuration_get_target,%) :
- $(call gb_Output_announce,$*,$(true),CFG,1)
+ $(call gb_Output_announce,$*,$(true),CFG,4)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)