Distinguish between --disable-gui and --without-x

For the static WASM build, we need to build with GUI but without
X11, as this just includes a static Qt backend.

We already have USING_X11, which indicates that the platform can
use X11 as a backend, so we can match --without-x to USING_X11=no,
independent from the --disable-gui setting.

This also moves vclmain and glxtest handling into gb_Executable_*
functions, as these need common checks, which were already broken
for some cases, including $(DLOPEN_LIBS) for the vcl plugins.

Change-Id: Ia2ddba3400b4306b609a1f64823cca75061e0593

13 files changed, 156 insertions, 269 deletions

diff --git a/canvas/Executable_canvasdemo.mk b/canvas/Executable_canvasdemo.mk
index 8af599ff1760..e47ae11dd13f 100644
--- a/canvas/Executable_canvasdemo.mk
+++ b/canvas/Executable_canvasdemo.mk
@@ -31,26 +31,12 @@ $(eval $(call gb_Executable_use_libraries,canvasdemo,\
     tl \
     sal \
     salhelper \
-    vcl \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,canvasdemo,\
     canvas/workben/canvasdemo \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,canvasdemo,\
-    vclmain \
-))
-
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
-$(eval $(call gb_Executable_add_libs,canvasdemo,\
-    -lm $(DLOPEN_LIBS) \
-    -lX11 \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,canvasdemo,\
-    glxtest \
-))
-endif
+$(eval $(call gb_Executable_use_vclmain,canvasdemo))
 
 # vim: set noet sw=4 ts=4:
diff --git a/configure.ac b/configure.ac
index cf311c773034..7340f40c34d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5162,10 +5162,6 @@ emscripten*)
     ;;
 esac
 
-if test "$with_x" = "no"; then
-    AC_MSG_ERROR([Use --disable-gui instead. How can we get rid of this option? No idea where it comes from.])
-fi
-
 DISABLE_GUI=""
 if test "$enable_gui" = "no"; then
     if test "$USING_X11" != TRUE; then
@@ -5178,6 +5174,10 @@ if test "$enable_gui" = "no"; then
 fi
 AC_SUBST(DISABLE_GUI)
 
+if test "$with_x" = "no"; then
+    USING_X11=
+fi
+
 WORKDIR="${BUILDDIR}/workdir"
 INSTDIR="${BUILDDIR}/instdir"
 INSTROOTBASE=${INSTDIR}${INSTROOTBASESUFFIX}
diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk
index 15b681cef048..2528efcc0413 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_Executable_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..eeedcfbc192b 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_Executable_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,\
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8df015866484..fc8937dde4d9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3161,7 +3161,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
         return;
     }
 
-#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
+#if defined(UNX) && !defined(MACOSX) && !defined(DISABLE_GUI)
 
     // Painting of zoomed or HiDPI spreadsheets is special, we actually draw everything at 100%,
     // and only set cairo's (or CoreGraphic's, in the iOS case) scale factor accordingly, so that
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 66b44e156904..4cac457a2cf9 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -85,6 +85,30 @@ define gb_Executable_set_targettype_gui
 $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,$(1))) : TARGETGUI := $(2)
 endef
 
+# call gb_Executable_use_glxtest,exe,add_libs
+define gb_Executable_use_glxtest
+$(call gb_Executable_use_libraries,$(1),vcl)
+
+ifeq (,$(DISABLE_DYNLOADING))
+$(call gb_Executable_add_libs,$(1),$(DLOPEN_LIBS))
+endif
+
+ifeq (,$(DISABLE_GUI))
+ifeq ($(USING_X11),TRUE)
+$(call gb_Executable_add_libs,$(1),-lX11 $(2))
+$(call gb_Executable_use_static_libraries,$(1),glxtest)
+endif
+endif
+
+endef # gb_Executable_use_glxtest
+
+# call gb_Executable_use_vclmain,exe,add_libs
+define gb_Executable_use_vclmain
+$(call gb_Executable_use_glxtest,$(1),$(2))
+$(call gb_Executable_use_static_libraries,$(1),vclmain)
+
+endef # gb_Executable_use_vclmain
+
 # forward the call to the gb_LinkTarget implementation
 # (note: because the function name is in $(1), the other args are shifted by 1)
 define gb_Executable__forward_to_Linktarget
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
index 1ec8841c1ab3..fdf3eb3843bc 100644
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -44,18 +44,15 @@ $(eval $(call gb_Executable_use_libraries,gengal,\
     cppu \
     cppuhelper \
     utl \
-    vcl \
     svxcore \
 ))
 
+$(eval $(call gb_Executable_use_vclmain,gengal))
+
 $(eval $(call gb_Executable_add_exception_objects,gengal,\
     svx/source/gengal/gengal \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,gengal,\
-    vclmain \
-))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_use_system_win32_libs,gengal,\
 	kernel32 \
@@ -65,25 +62,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,gengal,\
 ))
 endif
 
-ifeq ($(DISABLE_GUI),TRUE)
-$(eval $(call gb_Executable_add_libs,gengal,\
-	$(DLOPEN_LIBS) \
-))
-else
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
-$(eval $(call gb_Executable_add_libs,gengal,\
-	$(DLOPEN_LIBS) \
-    -lX11 \
-))
-
-ifeq ($(USING_X11),TRUE)
-$(eval $(call gb_Executable_use_static_libraries,gengal,\
-	glxtest \
-))
-endif
-endif
-endif
-
 $(eval $(call gb_Executable_add_default_nativeres,gengal))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index 78a10ccc6c78..6fb4a4648614 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -34,22 +34,6 @@ $(eval $(call gb_Executable_use_api,icontest,\
     udkapi \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,icontest,\
-    vclmain \
-))
-
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
-$(eval $(call gb_Executable_add_libs,icontest,\
-	-lm $(DLOPEN_LIBS) \
-    -lX11 \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,icontest,\
-	glxtest \
-))
-
-endif
-
 $(eval $(call gb_Executable_use_libraries,icontest,\
     comphelper \
     cppu \
@@ -57,9 +41,10 @@ $(eval $(call gb_Executable_use_libraries,icontest,\
     sal \
     tl \
     ucbhelper \
-    vcl \
 ))
 
+$(eval $(call gb_Executable_use_vclmain,icontest))
+
 $(eval $(call gb_Executable_add_exception_objects,icontest,\
     vcl/workben/icontest \
 ))
diff --git a/vcl/Executable_mtfdemo.mk b/vcl/Executable_mtfdemo.mk
index 5c4c45165535..a4d4d9354b20 100644
--- a/vcl/Executable_mtfdemo.mk
+++ b/vcl/Executable_mtfdemo.mk
@@ -26,29 +26,15 @@ $(eval $(call gb_Executable_use_libraries,mtfdemo,\
 	basegfx \
     tl \
     sal \
-    vcl \
     cppu \
     cppuhelper \
     comphelper \
 ))
 
+$(eval $(call gb_Executable_use_vclmain,mtfdemo))
+
 $(eval $(call gb_Executable_add_exception_objects,mtfdemo,\
     vcl/workben/mtfdemo \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,mtfdemo,\
-    vclmain \
-))
-
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
-$(eval $(call gb_Executable_add_libs,mtfdemo,\
-	-lm $(DLOPEN_LIBS) \
-    -lX11 \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,mtfdemo,\
-	glxtest \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index bee97cbac14b..6cabf4f6710b 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -16,10 +16,6 @@ $(eval $(call gb_Executable_use_api,ui-previewer,\
     udkapi \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\
-    vclmain \
-))
-
 $(eval $(call gb_Executable_use_libraries,ui-previewer,\
 	comphelper \
 	cppu \
@@ -27,9 +23,10 @@ $(eval $(call gb_Executable_use_libraries,ui-previewer,\
 	sal \
     tl \
     ucbhelper \
-    vcl \
 ))
 
+$(eval $(call gb_Executable_use_vclmain,ui-previewer))
+
 $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\
     vcl/source/uipreviewer/previewer \
 ))
@@ -38,17 +35,6 @@ $(eval $(call gb_Executable_add_defs,ui-previewer,\
     -DVCL_INTERNALS \
 ))
 
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
-$(eval $(call gb_Executable_add_libs,ui-previewer,\
-	-lm $(DLOPEN_LIBS) \
-    -lX11 \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\
-	glxtest \
-))
-endif
-
 $(eval $(call gb_Executable_add_default_nativeres,ui-previewer))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index a9a8d195fdc9..b4701dc7c0a6 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -43,26 +43,12 @@ $(eval $(call gb_Executable_use_libraries,vcldemo,\
     tl \
     sal \
 	salhelper \
-    vcl \
 ))
 
+$(eval $(call gb_Executable_use_vclmain,vcldemo))
+
 $(eval $(call gb_Executable_add_exception_objects,vcldemo,\
     vcl/workben/vcldemo \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,vcldemo,\
-    vclmain \
-))
-
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
-$(eval $(call gb_Executable_add_libs,vcldemo,\
-	-lm $(DLOPEN_LIBS) \
-    -lX11 \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,vcldemo,\
-	glxtest \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_visualbackendtest.mk b/vcl/Executable_visualbackendtest.mk
index c6c0d237018a..b8f44f33afcb 100644
--- a/vcl/Executable_visualbackendtest.mk
+++ b/vcl/Executable_visualbackendtest.mk
@@ -30,27 +30,12 @@ $(eval $(call gb_Executable_use_libraries,visualbackendtest,\
     tl \
     sal \
 	salhelper \
-    vcl \
 ))
 
+$(eval $(call gb_Executable_use_vclmain,visualbackendtest,-lm))
+
 $(eval $(call gb_Executable_add_exception_objects,visualbackendtest,\
     vcl/backendtest/VisualBackendTest \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,visualbackendtest,\
-    vclmain \
-))
-
-ifneq (, $(filter LINUX %BSD, $(OS)))
-$(eval $(call gb_Executable_add_libs,visualbackendtest,\
-	-lm \
-	$(DLOPEN_LIBS) \
-    -lX11 \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,visualbackendtest,\
-	glxtest \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index d9969c9992b3..7d88459d80ab 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -108,12 +108,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
     $(if $(filter SKIA,$(BUILD_TYPE)),skia) \
 ))
 
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,vcl,\
-     epoxy \
- ))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/animate/Animation \
     vcl/source/animate/AnimationBitmap \
@@ -202,7 +196,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/control/longcurr \
     vcl/source/control/imp_listbox \
     vcl/source/control/listbox \
-	vcl/source/control/managedmenubutton \
+    vcl/source/control/managedmenubutton \
     vcl/source/control/menubtn \
     vcl/source/control/NotebookbarPopup \
     vcl/source/control/PriorityHBox \
@@ -540,131 +534,153 @@ $(eval $(call gb_Library_add_cobjects,vcl,\
     vcl/source/filter/jpeg/transupp \
 ))
 
-vcl_headless_code= \
-    vcl/headless/svpframe \
-    $(if $(filter-out iOS,$(OS)), \
-        vcl/headless/svpbmp \
-        vcl/headless/svpgdi \
-        vcl/headless/svpdata \
-        vcl/headless/CustomWidgetDraw) \
+vcl_headless_code = \
+    vcl/headless/CustomWidgetDraw \
+    vcl/headless/svpbmp \
+    vcl/headless/svpcairotextrender \
+    vcl/headless/svpdata \
     vcl/headless/svpdummies \
+    vcl/headless/svpframe \
+    vcl/headless/svpgdi \
     vcl/headless/svpinst \
+    vcl/headless/svpprn \
+    vcl/headless/svptext \
     vcl/headless/svpvd \
+    vcl/unx/generic/app/gendata \
     vcl/unx/generic/app/gendisp \
     vcl/unx/generic/app/geninst \
     vcl/unx/generic/app/gensys \
-
-vcl_headless_freetype_code=\
-    vcl/headless/svpprn \
-    vcl/headless/svptext \
-    vcl/unx/generic/app/gendata \
+    vcl/unx/generic/fontmanager/fontconfig \
+    vcl/unx/generic/fontmanager/fontmanager \
+    vcl/unx/generic/fontmanager/fontsubst \
+    vcl/unx/generic/fontmanager/helper \
     vcl/unx/generic/gdi/cairotextrender \
     vcl/unx/generic/gdi/freetypetextrender \
     vcl/unx/generic/glyphs/freetype_glyphcache \
     vcl/unx/generic/glyphs/glyphcache \
-    vcl/unx/generic/fontmanager/fontsubst \
-    vcl/unx/generic/fontmanager/fontconfig \
-    vcl/unx/generic/fontmanager/fontmanager \
-    vcl/unx/generic/fontmanager/helper \
-    vcl/headless/svpcairotextrender \
     vcl/unx/generic/print/bitmap_gfx \
     vcl/unx/generic/print/common_gfx \
-    vcl/unx/generic/print/glyphset \
-    vcl/unx/generic/print/printerjob \
-    vcl/unx/generic/print/psputil \
+    vcl/unx/generic/print/genprnpsp \
     vcl/unx/generic/print/GenPspGfxBackend \
     vcl/unx/generic/print/genpspgraphics \
-    vcl/unx/generic/print/genprnpsp \
+    vcl/unx/generic/print/glyphset \
+    vcl/unx/generic/print/printerjob \
     vcl/unx/generic/print/prtsetup \
+    vcl/unx/generic/print/psputil \
     vcl/unx/generic/print/text_gfx \
-
-ifeq ($(USING_X11),TRUE)
-$(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/source/app/salplug \
     vcl/unx/generic/printer/jobdata \
     vcl/unx/generic/printer/ppdparser \
-    vcl/unx/generic/window/screensaverinhibitor \
-    vcl/unx/generic/printer/cpdmgr \
-    $(if $(filter TRUE,$(ENABLE_CUPS)),\
-        vcl/unx/generic/printer/cupsmgr \
-        vcl/unx/generic/printer/printerinfomanager \
-        , \
-        vcl/null/printerinfomanager \
-    ) \
-    $(vcl_headless_code) \
-    $(vcl_headless_freetype_code) \
-))
+    vcl/null/printerinfomanager \
 
-$(eval $(call gb_Library_use_externals,vcl,\
+vcl_default_unx_libs = \
     cairo \
-    cups \
-    dbus \
     fontconfig \
     freetype \
-    valgrind \
-))
-endif
 
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
+ifneq (,$(filter LINUX %BSD SOLARIS,$(OS)))
 $(eval $(call gb_Library_add_libs,vcl,\
-    -lm $(DLOPEN_LIBS) \
+    -lm \
+    $(if $(DISABLE_DYNLOADING),,$(DLOPEN_LIBS)) \
 ))
 endif
 
+#
+# DISABLE_GUI
+#
 ifeq ($(DISABLE_GUI),TRUE)
+
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/unx/generic/printer/jobdata \
-    vcl/unx/generic/printer/ppdparser \
-    vcl/null/printerinfomanager \
-    vcl/headless/headlessinst \
     vcl/skia/SkiaHelper \
     $(vcl_headless_code) \
-    $(vcl_headless_freetype_code) \
 ))
 
 $(eval $(call gb_Library_use_externals,vcl,\
-    cairo \
-    freetype \
-    fontconfig \
+    $(vcl_default_unx_libs) \
 ))
 
 else # ! DISABLE_GUI
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/skia/SkiaHelper \
     vcl/source/opengl/DeviceInfo \
     vcl/source/opengl/OpenGLContext \
     vcl/source/opengl/OpenGLHelper \
-    vcl/skia/SkiaHelper \
     $(if $(filter SKIA,$(BUILD_TYPE)), \
         vcl/skia/salbmp \
         vcl/skia/zone \
         vcl/skia/gdiimpl \
-        ) \
- ))
+    ) \
+))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_package,vcl,vcl_opengl_denylist))
-endif
+$(eval $(call gb_Library_use_externals,vcl,\
+    epoxy \
+))
+
+#
+# !DISABLE_GUI && USING_X11
+#
+ifeq ($(USING_X11),TRUE)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    $(if $(DISABLE_DYNLOADING),vcl/source/app/salplug_static,vcl/source/app/salplug) \
+    $(vcl_headless_code) \
+    vcl/unx/generic/window/screensaverinhibitor \
+    vcl/unx/generic/printer/cpdmgr \
+    $(if $(filter TRUE,$(ENABLE_CUPS)),\
+        vcl/unx/generic/printer/cupsmgr \
+        vcl/unx/generic/printer/printerinfomanager \
+    ) \
+))
+
+$(eval $(call gb_Library_use_externals,vcl,\
+    cups \
+    dbus \
+    valgrind \
+    $(vcl_default_unx_libs) \
+))
 
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 $(eval $(call gb_Library_add_libs,vcl,\
     -lX11 \
     -lXext \
 ))
+
+#
+# X11 with OPENGL / glx support
+#
+ifneq (,$(filter LINUX %BSD SOLARIS,$(OS)))
+$(eval $(call gb_Library_use_static_libraries,vcl,\
+    glxtest \
+))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/opengl/x11/X11DeviceInfo \
 ))
 endif
-endif # ! DISABLE_GUI
+
+else # !USING_X11
+
+#
+# !DISABLE_GUI && !USING_X11
+#
+# Code for all OS not handled later!
+#
+ifneq (,$(filter-out iOS WNT ANDROID MACOSX HAIKU,$(OS)))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    $(if $(DISABLE_DYNLOADING),vcl/source/app/salplug_static,vcl/source/app/salplug) \
+    $(vcl_headless_code) \
+))
+
+$(eval $(call gb_Library_use_externals,vcl,\
+    expat \
+    $(vcl_default_unx_libs) \
+))
+endif
+
+endif # !USING_X11
+endif # !DISABLE_GUI
 
 
 ifeq ($(OS),HAIKU)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/unx/generic/printer/jobdata \
-    vcl/unx/generic/printer/ppdparser \
-    vcl/null/printerinfomanager \
     $(vcl_headless_code) \
-    $(vcl_headless_freetype_code) \
 ))
 
 $(eval $(call gb_Library_add_libs,vcl,\
@@ -676,12 +692,10 @@ $(eval $(call gb_Library_add_exception_objects,vcl, \
 ))
 
 $(eval $(call gb_Library_use_externals,vcl,\
-    cairo \
-    fontconfig \
-    freetype \
     expat \
+    $(vcl_default_unx_libs) \
 ))
-endif
+endif # HAIKU
 
 
 ifeq ($(OS),ANDROID)
@@ -691,48 +705,50 @@ $(eval $(call gb_Library_add_libs,vcl,\
     -llo-bootstrap \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/unx/generic/printer/jobdata \
-    vcl/unx/generic/printer/ppdparser \
-    vcl/null/printerinfomanager \
     vcl/android/androidinst \
     $(vcl_headless_code) \
-    $(vcl_headless_freetype_code) \
 ))
 
 $(eval $(call gb_Library_use_externals,vcl,\
-    cairo \
-    fontconfig \
-    freetype \
     expat \
+    $(vcl_default_unx_libs) \
 ))
-endif
+endif # ANDROID
 
 
 ifeq ($(OS),iOS)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
     $(gb_OBJCXXFLAGS) \
 ))
+
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/ios/iosinst \
-    vcl/ios/dummies \
+    vcl/headless/svpdummies \
+    vcl/headless/svpframe \
+    vcl/headless/svpinst \
+    vcl/headless/svpvd \
     vcl/ios/clipboard \
-    vcl/ios/salios \
-    vcl/ios/iOSTransferable \
     vcl/ios/DataFlavorMapping \
+    vcl/ios/dummies \
     vcl/ios/HtmlFmtFlt \
+    vcl/ios/iosinst \
+    vcl/ios/iOSTransferable \
+    vcl/ios/salios \
     vcl/quartz/ctfonts \
     vcl/quartz/salbmp \
     vcl/quartz/salgdi \
     vcl/quartz/salgdicommon \
     vcl/quartz/salvd \
     vcl/quartz/utils \
-    $(vcl_headless_code) \
+    vcl/unx/generic/app/gendisp \
+    vcl/unx/generic/app/geninst \
+    vcl/unx/generic/app/gensys \
 ))
+
 $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
     UIKit \
     CoreFoundation \
 ))
-endif
+endif # iOS
 
 
 ifeq ($(OS),MACOSX)
@@ -744,7 +760,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/app/salplug \
 ))
-endif
+endif # MACOSX
 
 
 ifeq ($(OS),WNT)
@@ -764,18 +780,10 @@ $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
 
 # HACK: dependency on icon themes so running unit tests don't
 # prevent delivering these by having open file handles on WNT
-ifeq ($(gb_Side),host)
-$(eval $(call gb_Library_use_package,vcl,postprocess_images))
-endif
-endif # $(OS) == WNT
-
-
-ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
-ifeq ($(USING_X11),TRUE)
-$(eval $(call gb_Library_use_static_libraries,vcl,\
-	glxtest \
+$(eval $(call gb_Library_use_package,vcl,\
+    vcl_opengl_denylist \
+    $(if $(filter host,$(gb_Side)),postprocess_images) \
 ))
-endif
-endif
+endif # WNT
 
 # vim: set noet sw=4 ts=4: