diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | desktop/Executable_oosplash.mk | 6 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 4 | ||||
| -rw-r--r-- | toolkit/Library_tk.mk | 2 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 11 |
5 files changed, 9 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 0be2012923ac..236e6832569c 100644 --- a/configure.ac +++ b/configure.ac @@ -3966,7 +3966,7 @@ if test "$enable_headless" = "yes"; then if test "$GUIBASE" != "unx"; then AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice with --enable-headless]) fi - GUIBASE=headless + GUIBASE=not-used fi INPATH="${OUTPATH}${PROEXT}" diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 1e75f647a987..d3e375066ed9 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -35,15 +35,13 @@ $(eval $(call gb_Executable_add_libs,oosplash,\ endif -ifneq ($(GUIBASE),headless) +ifneq ($(ENABLE_HEADLESS),TRUE) + ifneq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,oosplash,\ -lX11 \ )) endif -endif - -ifneq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Executable_add_defs,oosplash,\ -DENABLE_QUICKSTART_LIBPNG \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 0ad9e669043d..4bc5f12f677e 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -145,7 +145,7 @@ $(eval $(call gb_Rdb_add_components,services,\ accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \ ) \ ) \ - $(if $(filter headless,$(GUIBASE)), \ + $(if $(ENABLE_HEADLESS), \ vcl/vcl.headless \ ) \ $(if $(filter-out WNT,$(OS)), \ @@ -295,7 +295,7 @@ $(eval $(call gb_Rdb_add_components,services,\ ) \ $(if $(filter-out MACOSX WNT,$(OS)), \ desktop/unx/splash/splash \ - $(if $(filter-out headless,$(GUIBASE)), \ + $(if $(ENABLE_HEADLESS),, \ shell/source/backends/desktopbe/desktopbe1 \ vcl/vcl.unx \ ) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 8525e3722be8..4d6280d7ff99 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -128,7 +128,7 @@ $(eval $(call gb_Library_add_cxxflags,tk,\ $(gb_OBJCXXFLAGS))) endif -ifneq ($(GUIBASE),headless) +ifeq (,$(ENABLE_HEADLESS)) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_libs,tk,\ -lX11 \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 46532a2d58d2..8daa5bb87333 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -27,7 +27,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 ($(GUIBASE),headless) +else ifeq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless)) else $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) @@ -324,12 +324,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ )) # handle X11 platforms, which have additional files and possibly system graphite -ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/generic/glyphs/graphite_serverfont \ -)) -endif -ifeq ($(GUIBASE),headless) +ifneq (,$(or $(filter unx,$(GUIBASE)),$(ENABLE_HEADLESS))) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) @@ -538,7 +533,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(GUIBASE),headless) +ifeq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_add_defs,vcl,\ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ |