diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2013-11-07 11:36:44 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2013-11-07 11:50:00 +0000 |
| commit | d324745fe95c7f0fad56f146e1e33f994a0d5de6 (patch) | |
| tree | 15a6fabaff6a54b97e7f963cd15d9f8a715daa8b | |
| parent | 49112ec909ef465ecb1aa2786a283b57034e6af4 (diff) | |
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
| -rw-r--r-- | desktop/Library_libreoffice.mk | 10 | ||||
| -rw-r--r-- | smoketest/Executable_libtest.mk | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/desktop/Library_libreoffice.mk b/desktop/Library_libreoffice.mk index dbe3e81313a4..b35c75da0284 100644 --- a/desktop/Library_libreoffice.mk +++ b/desktop/Library_libreoffice.mk @@ -7,25 +7,25 @@ # 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) \ -I$(SRCDIR)/desktop/inc \ )) -$(eval $(call gb_Library_add_libs,libreoffice,\ +$(eval $(call gb_StaticLibrary_add_libs,libreoffice,\ $(if $(filter $(OS),LINUX), \ -ldl \ -lpthread \ ) \ )) -$(eval $(call gb_Library_use_libraries,libreoffice,\ +$(eval $(call gb_StaticLibrary_use_libraries,libreoffice,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_exception_objects,libreoffice,\ +$(eval $(call gb_StaticLibrary_add_exception_objects,libreoffice,\ desktop/source/lib/shim \ )) diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk index 14bf3421add9..3d8ec6330296 100644 --- a/smoketest/Executable_libtest.mk +++ b/smoketest/Executable_libtest.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Executable_use_libraries,libtest,\ )) $(eval $(call gb_Executable_add_libs,libtest,\ + -ldl \ -pthread \ )) |