diff options
33 files changed, 46 insertions, 46 deletions
diff --git a/Repository.mk b/Repository.mk index b5c0b5b151a1..fdcb6115c507 100644 --- a/Repository.mk +++ b/Repository.mk @@ -200,7 +200,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ gengal \ $(if $(filter WNT,$(OS)),,uri-encode) \ $(if $(ENABLE_MACOSX_SANDBOX),, \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ ui-previewer \ ) \ ) \ @@ -429,7 +429,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ slideshow \ sot \ spell \ - $(if $(ENABLE_HEADLESS),,spl) \ + $(if $(DISABLE_GUI),,spl) \ storagefd \ $(call gb_Helper_optional,SCRIPTING,stringresource) \ svgio \ @@ -962,7 +962,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ extras_fonts \ - $(if $(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)), \ + $(if $(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)), \ postprocess_fontconfig) \ $(call gb_Helper_optional,MORE_FONTS,\ fonts_alef \ @@ -1017,7 +1017,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\ $(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ desktop_soffice_sh \ ) \ ) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fa19152cd6fb..6852ff356a9e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1220,7 +1220,7 @@ endif # ANDROID endif # SYSTEM_REDLAND -ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS)$(ENABLE_HEADLESS),) # or +ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS)$(DISABLE_GUI),) # or ifneq ($(SYSTEM_CAIRO),) diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 1f4c5246b651..2bec95c47e2d 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\ boost_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,avmedia,\ epoxy \ )) diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index c23c4a046f3a..4f98fc121251 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\ boost_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,chartcore,\ epoxy \ )) diff --git a/config_host.mk.in b/config_host.mk.in index 17c1341c29a5..0d87b7dfb535 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -141,7 +141,7 @@ export ENABLE_GSTREAMER_1_0=@ENABLE_GSTREAMER_1_0@ export ENABLE_GTK3=@ENABLE_GTK3@ export ENABLE_GTK=@ENABLE_GTK@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@ -export ENABLE_HEADLESS=@ENABLE_HEADLESS@ +export DISABLE_GUI=@DISABLE_GUI@ export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@ export ENABLE_JAVA=@ENABLE_JAVA@ export ENABLE_KDE4=@ENABLE_KDE4@ diff --git a/configure.ac b/configure.ac index 46758b51037d..85315fa473a7 100644 --- a/configure.ac +++ b/configure.ac @@ -4413,17 +4413,17 @@ 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 -ENABLE_HEADLESS="" +DISABLE_GUI="" if test "$enable_gui" = "no"; then if test "$USING_X11" != TRUE; then AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice with --disable-gui.]) fi USING_X11= - ENABLE_HEADLESS=TRUE + DISABLE_GUI=TRUE AC_DEFINE(HAVE_FEATURE_UI,0) test_cairo=yes fi -AC_SUBST(ENABLE_HEADLESS) +AC_SUBST(DISABLE_GUI) WORKDIR="${BUILDDIR}/workdir" INSTDIR="${BUILDDIR}/instdir" diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 7ae5435fd6ed..f2926cfe43d7 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -69,7 +69,7 @@ $(eval $(call gb_Library_use_externals,cui,\ icuuc \ icu_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,cui,\ epoxy \ )) diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 365b58fdab5e..a14acd626b74 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_add_libs,oosplash,\ endif -ifneq ($(ENABLE_HEADLESS),TRUE) +ifneq ($(DISABLE_GUI),TRUE) ifneq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,oosplash,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 288e26d47726..38e427d66173 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -123,7 +123,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/migration/migration \ )) -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_add_libs,sofficeapp,\ -lm $(DLOPEN_LIBS) \ -lpthread \ @@ -161,7 +161,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/lokclipboard \ )) endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/init \ desktop/source/lib/lokinteractionhandler \ diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 086e51e6ea26..dfb9542a6401 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ $(if $(ENABLE_BREAKPAD), \ Library_crashreport \ ) \ - $(if $(ENABLE_HEADLESS),,Library_spl) \ + $(if $(DISABLE_GUI),,Library_spl) \ Package_branding \ $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \ UIConfig_deployment \ diff --git a/emfio/CppunitTest_emfio_wmf_test.mk b/emfio/CppunitTest_emfio_wmf_test.mk index 82af839c3886..f411022b46e8 100644 --- a/emfio/CppunitTest_emfio_wmf_test.mk +++ b/emfio/CppunitTest_emfio_wmf_test.mk @@ -85,7 +85,7 @@ $(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\ icuuc \ lcms2 \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\ epoxy \ )) @@ -119,7 +119,7 @@ $(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\ )) endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\ cairo \ freetype \ diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index c6ad07a5c0b0..ce253fd6e58b 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \ $(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \ - $(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(ENABLE_HEADLESS)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \ + $(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \ $(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \ --disable-valgrind \ $(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \ diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 27cc0b940327..b02faf7b9310 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -34,7 +34,7 @@ endif # contain content from at least one of external/more_fonts/fc_local.snippet # (conditional on MORE_FONTS in BUILD_TYPE) and # extras/source/truetype/symbol/fc_local.snippet (unconditional): -ifneq ($(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)),) +ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,postprocess, \ CustomTarget_fontconfig \ Package_fontconfig \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index b427e659439e..054af64345af 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -150,7 +150,7 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/win32/syssh \ vcl/vcl.windows \ ) \ - $(if $(ENABLE_HEADLESS), \ + $(if $(DISABLE_GUI), \ vcl/vcl.headless \ ) \ $(if $(filter ANDROID,$(OS)), \ @@ -298,7 +298,7 @@ $(eval $(call gb_Rdb_add_components,services,\ desktop/source/migration/services/migrationoo2 \ desktop/source/migration/services/migrationoo3 \ desktop/source/offacc/offacc \ - $(if $(ENABLE_HEADLESS),,desktop/source/splash/spl) \ + $(if $(DISABLE_GUI),,desktop/source/splash/spl) \ extensions/source/abpilot/abp \ extensions/source/config/ldap/ldapbe2 \ $(if $(filter WNT,$(OS)),\ @@ -315,7 +315,7 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/unix/exec/syssh \ ) \ $(if $(filter-out MACOSX WNT,$(OS)), \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ shell/source/backends/desktopbe/desktopbe1 \ vcl/vcl.unx \ ) \ diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index ab21903dfd7c..96236e520652 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -50,7 +50,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_cache_test \ )) -ifneq ($(ENABLE_HEADLESS),TRUE) +ifneq ($(DISABLE_GUI),TRUE) ifeq ($(OS),LINUX) $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_tiledrendering \ diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 495aee8d89fa..e1ead370b2e3 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sd,\ )) endif -ifneq ($(ENABLE_HEADLESS),TRUE) +ifneq ($(DISABLE_GUI),TRUE) ifeq ($(OS),LINUX) $(eval $(call gb_Module_add_slowcheck_targets,sd,\ CppunitTest_sd_svg_export_tests \ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index d7367458c3b0..d1526754a1fb 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/in $(eval $(call gb_Library_use_externals,slideshow,\ boost_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,slideshow,\ epoxy \ )) diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index d08fe69aef55..ef8dcc65cee5 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -20,7 +20,7 @@ $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_Gallery_get_workdir,$(2))/* && \ RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),100,$(GALLERY_FILES)) && \ $(call gb_Helper_print_on_error,\ - $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \ SAL_USE_VCLPLUGIN=svp \ )) \ $(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \ diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 9b0590e35d2a..c579a34ea6d5 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -52,7 +52,7 @@ else UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \ PYTHONDONTWRITEBYTECODE=1 \ - $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \ SAL_USE_VCLPLUGIN=svp \ )) \ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \ diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index 03d30448ef7b..00579ebdb4e5 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -69,7 +69,7 @@ else PYTHONPATH="$(PYPATH)" \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*)))" \ PYTHONDONTWRITEBYTECODE=0 \ - $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \ SAL_USE_VCLPLUGIN=svp \ )) \ $(gb_UITest_COMMAND) \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 451897fc4765..00d9bc57921a 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -42,7 +42,7 @@ MERGE_LIBRARY_LIST := \ sfx \ sofficeapp \ sot \ - $(if $(ENABLE_HEADLESS),,spl) \ + $(if $(DISABLE_GUI),,spl) \ svl \ svt \ svx \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b87f6fc569dd..a67780a2cef8 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -227,7 +227,7 @@ gb_GLOBALDEFS += -DDEBUG \ endif endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) gb_GLOBALDEFS += -DLIBO_HEADLESS \ endif diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk index 844ab0b45e16..e4c73928711b 100644 --- a/svx/Executable_gengal.mk +++ b/svx/Executable_gengal.mk @@ -61,7 +61,7 @@ $(eval $(call gb_Executable_use_system_win32_libs,gengal,\ )) endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Executable_add_libs,gengal,\ $(DLOPEN_LIBS) \ -lpthread \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 601a03beb66a..54b551e5e0b5 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -86,7 +86,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\ libxml2 \ $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,svxcore,\ epoxy \ )) diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk index 3db2df0cf2fd..5f943f74f364 100644 --- a/sw/CppunitTest_sw_mailmerge.mk +++ b/sw/CppunitTest_sw_mailmerge.mk @@ -81,7 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \ uui/util/uui \ vcl/vcl.common \ $(if $(filter-out MACOSX WNT,$(OS)), \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ vcl/vcl.unx \ ) \ ) \ diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index e322445d052f..bf227939f074 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -81,7 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\ unoxml/source/service/unoxml \ uui/util/uui \ $(if $(filter-out MACOSX WNT,$(OS)), \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ vcl/vcl.unx \ ) \ ) \ diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index c8338ff481cc..b9127c379424 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -97,7 +97,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_unowriter \ )) -ifneq ($(ENABLE_HEADLESS),TRUE) +ifneq ($(DISABLE_GUI),TRUE) ifeq ($(OS),LINUX) $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_tiledrendering \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 29dc182bbc4f..2bc1dbdf2d0b 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_externals,tk,\ boost_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,tk,\ epoxy \ )) diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk index 9d2a132d6454..bae00152c77d 100644 --- a/vcl/CppunitTest_vcl_bitmap_test.mk +++ b/vcl/CppunitTest_vcl_bitmap_test.mk @@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\ boost_headers \ glm_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\ epoxy \ )) diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index 8c917b71cd0e..b162800e72fd 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Executable_use_externals,icontest,\ boost_headers \ glm_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Executable_use_externals,icontest,\ epoxy \ )) diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index c06725c297cf..125a151dec99 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Executable_use_externals,vcldemo,\ glm_headers \ harfbuzz \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Executable_use_externals,vcldemo,\ epoxy \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 95c466d27f20..2f69f6550dae 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -29,7 +29,7 @@ else ifeq ($(OS),ANDROID) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android)) else ifeq ($(OS),IOS) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios)) -else ifeq ($(ENABLE_HEADLESS),TRUE) +else ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless)) else $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) @@ -122,7 +122,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ lcms2 \ mdds_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,vcl,\ epoxy \ )) @@ -613,7 +613,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 0fc88c18c26f..b8731614797a 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -28,11 +28,11 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ $(if $(ENABLE_MACOSX_SANDBOX),, \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ Executable_ui-previewer)) \ $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \ Executable_outdevgrind \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ Executable_vcldemo \ Executable_icontest \ Executable_visualbackendtest \ @@ -224,7 +224,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ )) endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_timer \ )) |