[Libreoffice-commits] core.git: config_host.mk.in RepositoryExternal.mk

Stephan Bergmann sbergman at redhat.com
Tue Feb 7 16:08:11 UTC 2017


 RepositoryExternal.mk |   11 -----------
 config_host.mk.in     |    2 --
 2 files changed, 13 deletions(-)

New commits:
commit 2ec697a77f77caceec0a8cf6b6c68ae11a269a03
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 7 17:06:37 2017 +0100

    Remove DBUSMENUGTK left-overs
    
    ...after 4e7f9650e2a32b648cbd50ab113955920f960354 "remove ancient lo-menubar
    implementation now that we have the shiny new one"
    
    Change-Id: I49e7a5489279aaf3469d14c4e9d75245203c5937

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ed4ca9c..78ff701 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2582,17 +2582,6 @@ endef
 endif # ENABLE_DBUS
 
 
-define gb_LinkTarget__use_dbusmenugtk
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(DBUSMENUGTK_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(DBUSMENUGTK_LIBS))
-
-endef
-
-
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 
 define gb_LinkTarget__use_telepathy
diff --git a/config_host.mk.in b/config_host.mk.in
index 951e170..d52282d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -85,8 +85,6 @@ export CXX_X64_BINARY=@CXX_X64_BINARY@
 @x_CXXFLAGS@ export CXXFLAGS=@CXXFLAGS@
 export CXXFLAGS_CXX11=@CXXFLAGS_CXX11@
 export DATADIR=@DATADIR@
-export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
-export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
 export DCONF_CFLAGS=@DCONF_CFLAGS@


More information about the Libreoffice-commits mailing list