[Libreoffice-commits] .: 3 commits - translations/CustomTarget_translate.mk translations/prj

[Libreoffice Gerrit user]

 translations/CustomTarget_translate.mk |   22 ++++++++++++++--------
 translations/prj/makefile.mk           |    1 -
 2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 84442ae80f2169c541c7969bb27aedf3a57ece9d
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Sep 23 15:00:44 2012 +0200

    make deps on sdf files work

diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index d84f7f6..d5bb6a4 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -38,6 +38,9 @@ else
 translations_LANGS := $(filter-out en-US,$(WITH_LANG))
 endif
 
+$(translations_DIR)/sdf/%.sdf : $(translations_DIR)/merge.done
+	touch $@
+
 #TODO: remove localization_present.mk when translations are in tail_build
 $(translations_DIR)/merge.done : \
 		$(foreach lang,$(translations_LANGS),$(translations_DIR)/sdf-l10n/$(lang).sdf) \
commit 59266299e1c17d50fdf30f38c104811d4c6dc60e
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Sep 23 14:47:02 2012 +0200

    use pattern rule

diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index 07fdf2d..d84f7f6 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -55,20 +55,22 @@ $(translations_DIR)/merge.done : \
 			$(WORKDIR)/CustomTarget/translations/localization_present.mk && \
 		touch $@)
 
-define translations_RULE
-$(translations_DIR)/sdf-l10n/$(1).sdf : \
+$(translations_DIR)/sdf-l10n/%.sdf : \
 		$(translations_DIR)/sdf-template/en-US.sdf \
 		$(OUTDIR_FOR_BUILD)/bin/po2lo \
-		$$(shell find $(SRCDIR)/translations/source/$(1) -name "*\.po") \
 		| $(translations_DIR)/sdf-l10n/.dir
-	$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SDF,1)
-	$$(call gb_Helper_abbreviate_dirs, \
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SDF,1)
+	$(call gb_Helper_abbreviate_dirs, \
 		$(gb_PYTHON) $(OUTDIR_FOR_BUILD)/bin/po2lo --skipsource -i \
-			source/$(1) -t $$< -o $$@ -l $(1))
+			source/$* -t $< -o $@ -l $*)
+
+define translations_make_po_deps
+$(translations_DIR)/sdf-l10n/$(1).sdf : \
+		$$(shell find $(SRCDIR)/translations/source/$(1) -name "*\.po")
 
 endef
 
-$(foreach lang,$(translations_LANGS),$(eval $(call translations_RULE,$(lang))))
+$(eval $(foreach lang,$(translations_LANGS),$(call translations_make_po_deps,$(lang))))
 
 $(translations_DIR)/sdf-l10n/qtz.sdf : \
 		$(translations_DIR)/sdf-template/en-US.sdf \
commit fd4f521a880aec5f183f02ed5f85277d78741e75
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Sep 23 14:39:14 2012 +0200

    add missing dep

diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index 2e363cb..07fdf2d 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -41,7 +41,8 @@ endif
 #TODO: remove localization_present.mk when translations are in tail_build
 $(translations_DIR)/merge.done : \
 		$(foreach lang,$(translations_LANGS),$(translations_DIR)/sdf-l10n/$(lang).sdf) \
-		$(translations_DIR)/sdf-l10n/qtz.sdf
+		$(translations_DIR)/sdf-l10n/qtz.sdf \
+		$(OUTDIR_FOR_BUILD)/bin/fast_merge.pl
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MRG,2)
 	$(call gb_Helper_abbreviate_dirs, \
 		rm -rf $(translations_DIR)/sdf && mkdir $(translations_DIR)/sdf && \
diff --git a/translations/prj/makefile.mk b/translations/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/translations/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk