[Xfce4-commits] [xfce/xfce4-panel] 06/24: Get rid of dbus-glib libs and cflags

noreply at xfce.org noreply at xfce.org
Tue Jul 4 00:03:37 CEST 2017


This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-panel.

commit 47310591f521fbf6d60a9c30064c6acb49f3437c
Author: Ali Abdallah <ali at xfce.org>
Date:   Thu Jun 22 13:49:16 2017 +0200

    Get rid of dbus-glib libs and cflags
---
 configure.ac.in     | 1 -
 panel/Makefile.am   | 2 --
 wrapper/Makefile.am | 9 ++-------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 1f7feee..fae8134 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -151,7 +151,6 @@ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
 PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.24.0])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.73])
 XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [3.0])
 
diff --git a/panel/Makefile.am b/panel/Makefile.am
index b5f2e48..b39afae 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -64,7 +64,6 @@ xfce4_panel_CFLAGS = \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBWNCK_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(XFCONF_CFLAGS) \
 	$(LIBX11_CFLAGS) \
 	$(LIBWNCK_CFLAGS) \
@@ -84,7 +83,6 @@ xfce4_panel_LDADD = \
 	$(LIBXFCE4UI_LIBS) \
 	$(LIBWNCK_LIBS) \
 	$(XFCONF_LIBS) \
-	$(DBUS_LIBS) \
 	$(LIBX11_LIBS) \
 	$(LIBWNCK_LIBS) \
 	-lm
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index fa56540..6b70c95 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -10,11 +10,7 @@ wrapperdir = $(HELPER_PATH_PREFIX)/xfce4/panel
 wrapper_PROGRAMS = \
 	wrapper-2.0
 
-wrapper_built_sources = \
-	wrapper-dbus-client-infos.h
-
 wrapper_2_0_SOURCES = \
-	$(wrapper_built_sources) \
 	main.c \
 	wrapper-module.c \
 	wrapper-module.h \
@@ -23,7 +19,7 @@ wrapper_2_0_SOURCES = \
 
 wrapper_2_0_CFLAGS = \
 	$(GTK_CFLAGS) \
-	$(DBUS_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(GMODULE_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(PLATFORM_CFLAGS)
@@ -35,7 +31,7 @@ wrapper_2_0_LDFLAGS = \
 wrapper_2_0_LDADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
 	$(GTK_LIBS) \
-	$(DBUS_LIBS) \
+	$(GIO_LIBS) \
 	$(GMODULE_LIBS) \
 	$(LIBXFCE4UTIL_LIBS)
 
@@ -50,7 +46,6 @@ if ENABLE_GTK2_LIBRARY
 wrapper_PROGRAMS += wrapper-1.0
 
 wrapper_1_0_SOURCES = \
-	$(wrapper_built_sources) \
 	main.c \
 	wrapper-module.c \
 	wrapper-module.h \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list