build: remove dependency on dbus-glib and libdbus

Nothing depends on it any more.
This commit is contained in:
Cosimo Cecchi 2015-05-30 14:17:10 -07:00 committed by Richard Hughes
parent e035f23ae0
commit b549d8928b
8 changed files with 0 additions and 13 deletions

View file

@ -153,8 +153,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now],
AC_SUBST([RELRO_LDFLAGS]) AC_SUBST([RELRO_LDFLAGS])
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.34.0]) PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.34.0])
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.76])
PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.16.1]) PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.16.1])
PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0]) PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0])

View file

@ -31,7 +31,6 @@ IGNORE_HFILES= \
# CFLAGS and LDFLAGS for compiling scan program. Only needed # CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty. # if $(DOC_MODULE).types is non-empty.
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(DBUS_GLIB_CFLAGS) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-I$(top_srcdir)/libupower-glib \ -I$(top_srcdir)/libupower-glib \
-I$(top_builddir)/libupower-glib \ -I$(top_builddir)/libupower-glib \
@ -43,7 +42,6 @@ UPOWER_GLIB_LIBS = \
GTKDOC_LIBS = \ GTKDOC_LIBS = \
$(UPOWER_GLIB_LIBS) \ $(UPOWER_GLIB_LIBS) \
$(DBUS_GLIB_LIBS) \
$(NULL) $(NULL)
# Extra options to supply to gtkdoc-mkdb # Extra options to supply to gtkdoc-mkdb

View file

@ -29,7 +29,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(GIO_CFLAGS) \ $(GIO_CFLAGS) \
$(GIO_UNIX_CFLAGS) \ $(GIO_UNIX_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
@ -120,7 +119,6 @@ upowerd_LDADD = \
$(USB_LIBS) \ $(USB_LIBS) \
$(GIO_LIBS) \ $(GIO_LIBS) \
$(GIO_UNIX_LIBS) \ $(GIO_UNIX_LIBS) \
$(DBUS_GLIB_LIBS) \
$(UPOWER_LIBS) $(UPOWER_LIBS)
if BACKEND_TYPE_DUMMY if BACKEND_TYPE_DUMMY
@ -193,7 +191,6 @@ up_self_test_LDADD = \
dummy/libuptest.la \ dummy/libuptest.la \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GIO_CFLAGS) \ $(GIO_CFLAGS) \
$(DBUS_GLIB_LIBS) \
$(POLKIT_LIBS) \ $(POLKIT_LIBS) \
$(UPOWER_LIBS) $(UPOWER_LIBS)

View file

@ -5,7 +5,6 @@ AM_CPPFLAGS = \
-DUP_COMPILATION \ -DUP_COMPILATION \
-DG_LOG_DOMAIN=\"UPower-Dummy\" \ -DG_LOG_DOMAIN=\"UPower-Dummy\" \
-I$(top_srcdir)/libupower-glib \ -I$(top_srcdir)/libupower-glib \
$(DBUS_GLIB_CFLAGS) \
$(POLKIT_CFLAGS) \ $(POLKIT_CFLAGS) \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

View file

@ -5,7 +5,6 @@ AM_CPPFLAGS = \
-DUP_COMPILATION \ -DUP_COMPILATION \
-DG_LOG_DOMAIN=\"UPower-Freebsd\" \ -DG_LOG_DOMAIN=\"UPower-Freebsd\" \
-I$(top_srcdir)/libupower-glib \ -I$(top_srcdir)/libupower-glib \
$(DBUS_GLIB_CFLAGS) \
$(POLKIT_CFLAGS) \ $(POLKIT_CFLAGS) \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

View file

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libupower-glib \ -I$(top_srcdir)/libupower-glib \
$(USB_CFLAGS) \ $(USB_CFLAGS) \
$(GIO_CFLAGS) \ $(GIO_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \
$(POLKIT_CFLAGS) \ $(POLKIT_CFLAGS) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \

View file

@ -5,7 +5,6 @@ AM_CPPFLAGS = \
-DUP_COMPILATION \ -DUP_COMPILATION \
-DG_LOG_DOMAIN=\"UPower-Openbsd\" \ -DG_LOG_DOMAIN=\"UPower-Openbsd\" \
-I$(top_srcdir)/libupower-glib \ -I$(top_srcdir)/libupower-glib \
$(DBUS_GLIB_CFLAGS) \
$(POLKIT_CFLAGS) \ $(POLKIT_CFLAGS) \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

View file

@ -6,7 +6,6 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"UPower\" \ -DG_LOG_DOMAIN=\"UPower\" \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/libupower-glib \ -I$(top_srcdir)/libupower-glib \
$(DBUS_GLIB_CFLAGS) \
$(POLKIT_DBUS_CFLAGS) \ $(POLKIT_DBUS_CFLAGS) \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
@ -26,7 +25,6 @@ upower_LDFLAGS =
$(PIE_LDFLAGS) $(PIE_LDFLAGS)
upower_LDADD = \ upower_LDADD = \
$(DBUS_GLIB_LIBS) \
$(UPOWER_LIBS) \ $(UPOWER_LIBS) \
$(POLKIT_DBUS_LIBS) $(POLKIT_DBUS_LIBS)