[gnome-utils] build: remove GTK2 dependency completely
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-utils] build: remove GTK2 dependency completely
- Date: Wed, 20 Oct 2010 22:57:20 +0000 (UTC)
commit d9de09ac57102fd6e10308e8f18ea2c755836177
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Oct 20 20:22:49 2010 +0200
build: remove GTK2 dependency completely
configure.ac | 5 -----
gnome-dictionary/docs/reference/gdict/Makefile.am | 4 ++--
gnome-dictionary/src/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9d9eb86..b5eda58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,6 @@ dnl pkg-config check
GLIB_REQUIRED=2.20.0
GIO_REQUIRED=2.16.0
-GTK2_REQUIRED=2.20.0
GTK_REQUIRED=2.91.1
GIO_UNIX_REQUIRED=2.18.0
LIBPANEL_APPLET_REQUIRED=2.13.4
@@ -94,10 +93,6 @@ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= $GIO_UNIX_REQUIRED)
AC_SUBST(GIO_UNIX_CFLAGS)
AC_SUBST(GIO_UNIX_LIBS)
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
-
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
diff --git a/gnome-dictionary/docs/reference/gdict/Makefile.am b/gnome-dictionary/docs/reference/gdict/Makefile.am
index 63ac9ab..10a2ad0 100644
--- a/gnome-dictionary/docs/reference/gdict/Makefile.am
+++ b/gnome-dictionary/docs/reference/gdict/Makefile.am
@@ -54,14 +54,14 @@ GTKDOC_CFLAGS = \
$(CFLAGS) \
$(CPPFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK2_CFLAGS) \
+ $(GTK_CFLAGS) \
-I$(srcdir)/../../../libgdict \
-I$(top_builddir)/gnome-dictionary/libgdict
GTKDOC_LIBS = \
$(LDFLAGS) \
$(GLIB_LIBS) \
- $(GTK2_LIBS) \
+ $(GTK_LIBS) \
../../../libgdict/libgdict-1.0.la
include $(top_srcdir)/gtk-doc.make
diff --git a/gnome-dictionary/src/Makefile.am b/gnome-dictionary/src/Makefile.am
index 04cafbe..526f433 100644
--- a/gnome-dictionary/src/Makefile.am
+++ b/gnome-dictionary/src/Makefile.am
@@ -90,7 +90,7 @@ gnome_dictionary_applet_LDADD = \
$(top_builddir)/gnome-dictionary/libgdict/libgdict-1.0.la \
$(GLIB_LIBS) \
$(GIO_LIBS) \
- $(GTK2_LIBS) \
+ $(GTK_LIBS) \
$(GCONF_LIBS) \
$(APPLET_LIBS) \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]