solenv/gbuild/AllLangResTarget.mk | 2 +-
solenv/gbuild/Configuration.mk | 1 +
solenv/gbuild/ExtensionTarget.mk | 4 ++++
solenv/gbuild/InstallModuleTarget.mk | 1 +
solenv/gbuild/UI.mk | 1 +
5 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit d1bfce298bb0414cafcd94cc8cd4694bdc3b4811
Author: Andras Timar <ati...@suse.com>
Date: Sat Nov 24 00:11:01 2012 +0100
missing po files should not don't break the build
Change-Id: I686341c79e77f16c6a4cd81cf9fedcd25c4e4996
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 78a775e..1715fba 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -79,7 +79,7 @@ endef
define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl
$(call gb_SrsPartMergeTarget_get_target,$(1)) : POFILES := $(2)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(2)
-
+$(2) :
endef
# SrsPartTarget class
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 95f20e3..84b9fab 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -282,6 +282,7 @@ $(call gb_XcuMergeTarget_get_target,$(1)) : \
$(wildcard $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po))
$(call gb_XcuMergeTarget_get_target,$(1)) : \
POFILES := $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po) :
endef
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index dbe219d..b679cca 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -151,6 +151,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : \
POFILES := $(foreach
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
$(foreach
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+$(foreach
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) :
endif
$(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
@@ -248,6 +249,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
POFILE := $(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst
$(SRCDIR),,$(dir $(3)))).po
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
$(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst
$(SRCDIR),,$(dir $(3)))).po
+$(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir
$(3)))).po :
endif
$(call gb_ExtensionTarget_get_target,$(1)) : $(call
gb_ExtensionTarget_get_rootdir,$(1))/$(2)
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) \
@@ -328,6 +330,7 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
: \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)))))
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)))))
+$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst
./,.po,$(dir $(or $(4),$(3))))) :
endif
endif
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
@@ -369,6 +372,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3)
: \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(4))))
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(4))))
+$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst
./,.po,$(dir $(4)))) :
endif
endif
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
diff --git a/solenv/gbuild/InstallModuleTarget.mk
b/solenv/gbuild/InstallModuleTarget.mk
index 4ea77c9..f6ed5b2 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -146,6 +146,7 @@ $(call gb_ScpMergeTarget_get_target,$(1)) : \
SCP_POFILES := $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
$(call gb_ScpMergeTarget_get_target,$(1)) : \
$(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po) :
endef
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 73c69c5..92c1a57 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -53,6 +53,7 @@ $(call gb_UILocalizeTarget_get_target,$(1)) : $(foreach
lang,$(gb_UITarget_LANGS
$(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/$(2).ui
$(call gb_UILocalizeTarget_get_target,$(1)) :| $(dir $(call
gb_UILocalizeTarget_get_target,$(1))).dir
+$(foreach lang,$(gb_UITarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(2))).po) :
endef
# class UITarget
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
