dtrans/Library_dnd.mk | 1 -
dtrans/Library_ftransl.mk | 5 ++++-
dtrans/Library_sysdtrans.mk | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit fe4be5047988782f3143a1af505c5eecb3f2af5a
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Mar 14 13:20:50 2012 +0100
fdo#47246: dtrans: fix multiply linked ImplHelper
No idea whether linking ftransl against static library dtobj is good,
but the other two libraries here link against it already...
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 58f0f00..141d15b 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,dnd,\
dtrans/source/win32/dnd/target \
dtrans/source/win32/dnd/targetdragcontext \
dtrans/source/win32/dnd/targetdropcontext \
- dtrans/source/win32/misc/ImplHelper \
))
# vim: set noet sw=4 ts=4:
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index 3ba3c3e..706cbd0 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -50,8 +50,11 @@ $(eval $(call gb_Library_add_linked_libs,ftransl,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_add_linked_static_libs,ftransl,\
+ dtobj \
+))
+
$(eval $(call gb_Library_add_exception_objects,ftransl,\
- dtrans/source/win32/misc/ImplHelper \
dtrans/source/win32/ftransl/ftransl \
dtrans/source/win32/ftransl/ftranslentry \
))
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 8fb7a41..8507675 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -67,7 +67,6 @@ $(eval $(call gb_Library_add_exception_objects,sysdtrans,\
dtrans/source/win32/clipb/WinClipboard \
dtrans/source/win32/clipb/wcbentry \
dtrans/source/win32/clipb/MtaOleClipb \
- dtrans/source/win32/misc/ImplHelper \
))
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
