diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-14 13:20:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-14 13:23:06 +0100 |
| commit | fe4be5047988782f3143a1af505c5eecb3f2af5a (patch) | |
| tree | c5ddb52e92e28487c840682115ffa08d52f4a70c /dtrans | |
| parent | 848127a6c3975bbbe09d8fe9ca704bf47030168d (diff) | |
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...
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/Library_dnd.mk | 1 | ||||
| -rw-r--r-- | dtrans/Library_ftransl.mk | 5 | ||||
| -rw-r--r-- | dtrans/Library_sysdtrans.mk | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 58f0f005fdd3..141d15b3a934 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 3ba3c3e830a7..706cbd02aa9e 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 8fb7a418c139..85076757126b 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: |