[gnome-keyring] Remove dependency on gtk+
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] Remove dependency on gtk+
- Date: Wed, 17 Oct 2012 08:11:15 +0000 (UTC)
commit 408f6ee72fc08697003c1aa811b1657f5c673878
Author: Stef Walter <stefw gnome org>
Date: Fri Oct 12 16:54:02 2012 +0200
Remove dependency on gtk+
* We depend on gcr which has a dependency on gtk+ but we don't need
to depend on it expcilitly.
* Remove unused egg-secure-buffer.[ch] code.
https://bugzilla.gnome.org/show_bug.cgi?id=686035
configure.ac | 5 -
daemon/control/tests/Makefile.am | 2 -
egg/Makefile.am | 9 --
egg/egg-entry-buffer.c | 200 --------------------------------------
egg/egg-entry-buffer.h | 59 -----------
tool/Makefile.am | 1 -
6 files changed, 0 insertions(+), 276 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2d9a640..a41b580 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,6 @@ PKG_CHECK_MODULES(GIO, glib-2.0 >= 2.25.0 gio-2.0)
AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS)
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS"
DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS"
@@ -583,7 +579,6 @@ AC_MSG_CHECKING([build strict])
if test "$enable_strict" = "yes"; then
CFLAGS="$CFLAGS -Werror \
- -DGTK_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED"
diff --git a/daemon/control/tests/Makefile.am b/daemon/control/tests/Makefile.am
index 5d08d9f..b390a1d 100644
--- a/daemon/control/tests/Makefile.am
+++ b/daemon/control/tests/Makefile.am
@@ -2,12 +2,10 @@ INCLUDES= \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/daemon \
- $(GTK_CFLAGS) \
$(GLIB_CFLAGS)
LIBS = \
$(GLIB_LIBS) \
- $(GTK_LIBS) \
$(GTHREAD_LIBS) \
$(P11_TESTS_LIBS)
diff --git a/egg/Makefile.am b/egg/Makefile.am
index b43b4a6..fe08886 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -8,7 +8,6 @@ noinst_LTLIBRARIES = \
libegg-dbus.la \
libegg-secure.la \
libegg-prompt.la \
- libegg-entry-buffer.la \
libegg-hex.la \
libegg-test.la
@@ -77,14 +76,6 @@ libegg_asn1x_la_CFLAGS = \
libegg_secure_la_SOURCES = \
egg-secure-memory.c egg-secure-memory.h
-libegg_entry_buffer_la_SOURCES = \
- egg-entry-buffer.c egg-entry-buffer.h
-
-libegg_entry_buffer_la_CFLAGS = \
- $(GOBJECT_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
-
libegg_buffer_la_SOURCES = \
egg-buffer.c egg-buffer.h
diff --git a/tool/Makefile.am b/tool/Makefile.am
index 3efac5e..9f51d35 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -26,7 +26,6 @@ gnome_keyring_ GKR_MAJOR@_LDADD = \
$(GCK_LIBS) \
$(GCR_LIBS) \
$(GTHREAD_LIBS) \
- $(GTK_LIBS) \
$(GCRYPT_LIBS) \
$(DAEMON_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]