Kaydet (Commit) d324745f authored tarafından Michael Meeks's avatar Michael Meeks

liblibo: make liblibreoffice static as it should be.

The whole purpose of this tiny library is to break dependencies,
so requiring it in our library path is a bit silly.

Change-Id: Ie0e000b97db87afd57f693e19341eadf97323335
üst 49112ec9
...@@ -7,25 +7,25 @@ ...@@ -7,25 +7,25 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_Library_Library,libreoffice)) $(eval $(call gb_StaticLibrary_StaticLibrary,libreoffice))
$(eval $(call gb_Library_set_include,libreoffice,\ $(eval $(call gb_StaticLibrary_set_include,libreoffice,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(SRCDIR)/desktop/inc \ -I$(SRCDIR)/desktop/inc \
)) ))
$(eval $(call gb_Library_add_libs,libreoffice,\ $(eval $(call gb_StaticLibrary_add_libs,libreoffice,\
$(if $(filter $(OS),LINUX), \ $(if $(filter $(OS),LINUX), \
-ldl \ -ldl \
-lpthread \ -lpthread \
) \ ) \
)) ))
$(eval $(call gb_Library_use_libraries,libreoffice,\ $(eval $(call gb_StaticLibrary_use_libraries,libreoffice,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_Library_add_exception_objects,libreoffice,\ $(eval $(call gb_StaticLibrary_add_exception_objects,libreoffice,\
desktop/source/lib/shim \ desktop/source/lib/shim \
)) ))
......
...@@ -20,6 +20,7 @@ $(eval $(call gb_Executable_use_libraries,libtest,\ ...@@ -20,6 +20,7 @@ $(eval $(call gb_Executable_use_libraries,libtest,\
)) ))
$(eval $(call gb_Executable_add_libs,libtest,\ $(eval $(call gb_Executable_add_libs,libtest,\
-ldl \
-pthread \ -pthread \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment