[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in desktop/Library_sofficeapp.mk solenv/gbuild vcl/Library_vcl.mk

[Matus Kukan]

 config_host.mk.in             |    1 +
 configure.in                  |    2 --
 desktop/Library_sofficeapp.mk |    4 ----
 solenv/gbuild/gbuild.mk       |    4 ++++
 vcl/Library_vcl.mk            |    1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit f8a120b0e4843139b3d739725ce54269cfd96bd1
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon Feb 20 18:39:14 2012 +0100

    headless: cleanup HEADLESS definition
    
    Define HEADLESS globally as it is meant to be.

diff --git a/config_host.mk.in b/config_host.mk.in
index 1abf218..0385fa4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -102,6 +102,7 @@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
 export ENABLE_GTK3=@ENABLE_GTK3@
 export ENABLE_GTK=@ENABLE_GTK@
 export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
+export ENABLE_HEADLESS=@ENABLE_HEADLESS@
 export ENABLE_KAB=@ENABLE_KAB@
 export ENABLE_KDE4=@ENABLE_KDE4@
 export ENABLE_KDE=@ENABLE_KDE@
diff --git a/configure.in b/configure.in
index 39fe207..0d320e7 100644
--- a/configure.in
+++ b/configure.in
@@ -8108,8 +8108,6 @@ if test "x$enable_headless" = "xyes"; then
     ENABLE_HEADLESS="TRUE"
     SCPDEFS="$SCPDEFS -DHEADLESS"
     R="headless"
-    # this does not work see hack in Library_vcl.mk
-    AC_DEFINE(HEADLESS)
 fi
 AC_SUBST(ENABLE_HEADLESS)
 
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b544f74..26eecbc 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -237,6 +237,10 @@ ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE)
 gb_GLOBALDEFS += -DENABLE_GRAPHITE
 endif
 
+ifeq ($(strip $(ENABLE_HEADLESS)),TRUE)
+gb_GLOBALDEFS += -DHEADLESS
+endif
+
 ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
 gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
 endif
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3420f7d..843dceb 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -456,7 +456,6 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\
     $$(FREETYPE_CFLAGS) \
 ))
 $(eval $(call gb_Library_add_defs,vcl,\
-    -DHEADLESS \
     -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
     -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
     -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
commit 3c177b96b80b9f506a6a93542cea870b3f8e1f51
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon Feb 20 11:38:15 2012 +0100

    desktop: remove duplicated gb_Library_set_include call

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index ae078a7..6880eec 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -46,10 +46,6 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\
     $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
 ))
 
-$(eval $(call gb_Library_set_include,sofficeapp,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,sofficeapp,\
     comphelper \
     cppu \