summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-06-21 16:31:03 +0200
committerMichael Stahl <mstahl@redhat.com>2013-06-27 12:27:08 +0000
commit4e11246cc8f0b39562daf083e894ded86a8e2146 (patch)
tree76d5bb7bd72f40165b08267a54959634ff4c4379 /i18npool
parentaf93691a3d9dd81fed39295dcc6bc18be2071d59 (diff)
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@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4571 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/Library_i18npool.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index b5786646152b..e91465b4e7d9 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: