[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - i18npool/Library_i18npool.mk

[David Tardon]

 i18npool/Library_i18npool.mk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4e11246cc8f0b39562daf083e894ded86a8e2146
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jun 21 16:31:03 2013 +0200

    Revert "better dependency working also for libmerged"
    
    It might work with libmerged, but it does not work otherwise.
    
    This reverts commit f8fd2e6a3b21ec3899a74d7400cafaba4e83ff6c.
    (cherry picked from commit 247f37890060330f3c3d2d05bbd8e36d689e9ada)
    
    Change-Id: I3b9f8831cf64514a089289dfd0631b7b9e24c6b7
    Signed-off-by: David Tardon <dtardon at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/4571
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index b578664..e91465b 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -136,10 +136,10 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
 # i18npool dlopens localedata_* libraries.
 # This is runtime dependency to prevent tests
 # to be run sooner then localedata_* exists.
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,i18npool)) :| \
-	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_en)) \
-	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_es)) \
-	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_euro)) \
-	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_others)) \
+$(call gb_Library_get_target,i18npool) : | \
+	$(call gb_Library_get_target,localedata_en) \
+	$(call gb_Library_get_target,localedata_es) \
+	$(call gb_Library_get_target,localedata_euro) \
+	$(call gb_Library_get_target,localedata_others) \
 
 # vim: set noet sw=4 ts=4: