diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-12-08 09:42:34 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-17 21:38:39 +0100 |
| commit | 5b0d059a8249acec033ba04b1aa8fc35181cc635 (patch) | |
| tree | 00bc93292a6e0b40e818e596d9f28e1108fbe933 /desktop | |
| parent | 9ffa72bd4acb9d8e1fc831246f2c80e8236cf6d5 (diff) | |
No glxtest library unless USING_X11
Change-Id: Ibcc0eeba9beaaeea86bdda5e0ea80e54c25621a9
(cherry picked from commit 986ba9a7e8b49f0c37fbd8f855e249a9f257ad08)
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CppunitTest_desktop_app.mk | 2 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk index 1b1c361c142a..6189f05c12a5 100644 --- a/desktop/CppunitTest_desktop_app.mk +++ b/desktop/CppunitTest_desktop_app.mk @@ -46,9 +46,11 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \ )) 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) \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 816426087e49..1d91403a83bb 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -118,9 +118,11 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\ )) 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) \ |