diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-26 07:13:15 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-26 22:51:05 +0200 |
| commit | c22f23556d03e1ac0c8be7a79597c822b7e29fc9 (patch) | |
| tree | 7fc70cfda9a1db747ace9725fbf3fa61b7f2f12b /desktop | |
| parent | ca242dfefa03016a9b0f675cb91b4605ce80875d (diff) | |
gbuild: Handle glxtest + vclmain usage via macros
Use a macro to do the same checks for all Executable with glxtest
or vclmain usage. Both are static libraries, so every user has the
same dependencies. Introduces:
* gb_Executable_use_vclmain
* gb_Executable_use_glxtest
Change-Id: Ib80b4e7c6f5078d47ad8f1ec5708a7174415f705
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116145
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CppunitTest_desktop_app.mk | 17 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 28 |
2 files changed, 4 insertions, 41 deletions
diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk index 15b681cef048..ee5c1247cc91 100644 --- a/desktop/CppunitTest_desktop_app.mk +++ b/desktop/CppunitTest_desktop_app.mk @@ -47,9 +47,10 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \ tl \ ucbhelper \ utl \ - vcl \ )) +$(eval $(call gb_CppunitTest_use_glxtest,desktop_app,-lm)) + ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_static_libraries,desktop_app,\ $(if $(ENABLE_ONLINE_UPDATE_MAR),\ @@ -57,20 +58,6 @@ $(eval $(call gb_CppunitTest_use_static_libraries,desktop_app,\ )) endif - -ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -ifeq ($(USING_X11),TRUE) -$(eval $(call gb_CppunitTest_use_static_libraries,desktop_app,\ - glxtest \ -)) -endif - -$(eval $(call gb_CppunitTest_add_libs,desktop_app,\ - -lm $(DLOPEN_LIBS) \ - -lX11 \ -)) -endif - $(eval $(call gb_CppunitTest_use_library_objects,desktop_app, \ sofficeapp \ )) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index fd4dc5ccaa33..c9785eb059cf 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -16,12 +16,6 @@ $(eval $(call gb_Library_set_include,sofficeapp,\ -I$(SRCDIR)/desktop/source/deployment/inc \ )) -$(eval $(call gb_Library_add_libs,sofficeapp,\ - $(if $(filter LINUX %BSD SOLARIS, $(OS)), \ - $(DLOPEN_LIBS) \ - ) \ -)) - $(eval $(call gb_Library_use_externals,sofficeapp, \ $(if $(ENABLE_BREAKPAD),breakpad) \ $(if $(filter OPENCL,$(BUILD_TYPE)),clew) \ @@ -79,9 +73,10 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ tl \ ucbhelper \ utl \ - vcl \ )) +$(eval $(call gb_Library_use_glxtest,sofficeapp,-lm)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,sofficeapp,\ $(if $(ENABLE_ONLINE_UPDATE_MAR),\ @@ -132,25 +127,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/migration/migration \ )) -ifeq ($(DISABLE_GUI),TRUE) -$(eval $(call gb_Library_add_libs,sofficeapp,\ - -lm $(DLOPEN_LIBS) \ -)) -else -ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -ifeq ($(USING_X11),TRUE) -$(eval $(call gb_Library_use_static_libraries,sofficeapp,\ - glxtest \ -)) -endif - -$(eval $(call gb_Library_add_libs,sofficeapp,\ - -lm $(DLOPEN_LIBS) \ - -lX11 \ -)) -endif -endif - # LibreOfficeKit bits ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ |