diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2013-11-07 14:21:40 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2013-11-07 14:21:40 +0000 |
| commit | 6f16fd620df2251b43695ed04a561398f2c6310e (patch) | |
| tree | 28d996ef811941b26056bc763ca6fa397b4fc05b | |
| parent | 07e3af405a8f16a9495de2d0642c67e660bbf8f0 (diff) | |
liblibo: fix static library linkage.
Change-Id: Ic6b69b322c819ff07d55e3b452dadafc60041e1d
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | smoketest/Executable_libtest.mk | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index c5bec399e5f5..9b688ac6b7a5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -562,7 +562,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - libreoffice \ pyuno \ pyuno_wrapper \ recentfile \ diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk index 3d8ec6330296..9f965b6c0f3d 100644 --- a/smoketest/Executable_libtest.mk +++ b/smoketest/Executable_libtest.mk @@ -15,10 +15,13 @@ $(eval $(call gb_Executable_set_include,libtest,\ )) $(eval $(call gb_Executable_use_libraries,libtest,\ - libreoffice \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Executable_use_static_libraries,libtest,\ + libreoffice \ +)) + $(eval $(call gb_Executable_add_libs,libtest,\ -ldl \ -pthread \ |