[Libreoffice-commits] core.git: Repository.mk smoketest/Executable_libtest.mk

[Michael Meeks]

 Repository.mk                   |    1 -
 smoketest/Executable_libtest.mk |    5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6f16fd620df2251b43695ed04a561398f2c6310e
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Nov 7 14:21:40 2013 +0000

    liblibo: fix static library linkage.
    
    Change-Id: Ic6b69b322c819ff07d55e3b452dadafc60041e1d

diff --git a/Repository.mk b/Repository.mk
index c5bec39..9b688ac 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 3d8ec63..9f965b6 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 \