[Libreoffice-commits] .: Branch 'libreoffice-3-5' - i18npool/Library_collator_data.mk i18npool/Library_i18npool.mk i18npool/Library_index_data.mk i18npool/Library_textconv_dict.mk

[Lubos Lunak]

 i18npool/Library_collator_data.mk |    3 ++-
 i18npool/Library_i18npool.mk      |    5 ++---
 i18npool/Library_index_data.mk    |    3 ++-
 i18npool/Library_textconv_dict.mk |    3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 3ab34677d8a20eb098b6310601bc353d455d3bff
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Mar 26 20:51:45 2012 +0200

    i18npool: fix dependency problem
    
    When parsing makefiles, there is no guarantee that all files
    are already generated, so we can't use $(wildcard $(WORKDIR)/..).
    
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk
index 7f00e8b..bfc38ce 100644
--- a/i18npool/Library_collator_data.mk
+++ b/i18npool/Library_collator_data.mk
@@ -31,7 +31,8 @@ $(eval $(call gb_Library_Library,collator_data))
 $(eval $(call gb_Library_add_package_headers,collator_data,i18npool_generated))
 
 $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\
-	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/collator/collator_*.cxx))) \
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\
+		CustomTarget/i18npool/source/collator/collator_$(notdir $(basename $(txt)))) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 3faaa6a..57875c9 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -139,11 +139,10 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
 	i18npool/source/transliteration/transliteration_OneToOne \
 ))
 
-BRKFILES := $(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/breakiterator/*_brk.c))) \
-
 $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
 	CustomTarget/i18npool/source/breakiterator/OpenOffice_dat \
-	$(BRKFILES) \
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt),\
+		CustomTarget/i18npool/source/breakiterator/$(notdir $(basename $(txt)))_brk) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk
index 43d4c52..68eaa58 100644
--- a/i18npool/Library_index_data.mk
+++ b/i18npool/Library_index_data.mk
@@ -31,7 +31,8 @@ $(eval $(call gb_Library_Library,index_data))
 $(eval $(call gb_Library_add_package_headers,index_data,i18npool_generated))
 
 $(eval $(call gb_Library_add_generated_exception_objects,index_data,\
-	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/indexentry/*.cxx))) \
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\
+		CustomTarget/i18npool/source/indexentry/$(notdir $(basename $(txt)))) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk
index 3b9213c..8df4a29 100644
--- a/i18npool/Library_textconv_dict.mk
+++ b/i18npool/Library_textconv_dict.mk
@@ -41,7 +41,8 @@ $(eval $(call gb_Library_add_api,textconv_dict,\
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\
-	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/textconversion/*.cxx))) \
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\
+		CustomTarget/i18npool/source/textconversion/$(notdir $(basename $(txt)))) \
 ))
 
 # vim: set noet sw=4 ts=4: