diff options
| -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 \ )) |