aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-07 21:49:08 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-08 17:40:30 +0800
commitbc2b3bf0966076e8452a170a9741ded016051f44 (patch)
treed7abd4f1a696570963eb4c09b946b55c119707ae
parent85063c344a4dada140b609c726118a889e4e09ac (diff)
downloadgsoc2013-empathy-bc2b3bf0966076e8452a170a9741ded016051f44.tar
gsoc2013-empathy-bc2b3bf0966076e8452a170a9741ded016051f44.tar.gz
gsoc2013-empathy-bc2b3bf0966076e8452a170a9741ded016051f44.tar.bz2
gsoc2013-empathy-bc2b3bf0966076e8452a170a9741ded016051f44.tar.lz
gsoc2013-empathy-bc2b3bf0966076e8452a170a9741ded016051f44.tar.xz
gsoc2013-empathy-bc2b3bf0966076e8452a170a9741ded016051f44.tar.zst
gsoc2013-empathy-bc2b3bf0966076e8452a170a9741ded016051f44.zip
move GTK+ check to its own PKG_CHECK_MODULES
-rw-r--r--configure.ac3
-rw-r--r--libempathy-gtk/Makefile.am2
-rw-r--r--nautilus-sendto-plugin/Makefile.am3
-rw-r--r--src/Makefile.am2
-rw-r--r--tests/interactive/Makefile.am4
5 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 5c5921a83..12d9cac08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,7 +155,6 @@ PKG_CHECK_MODULES(EMPATHY,
gobject-2.0
gstreamer-0.10
gstreamer-interfaces-0.10
- gtk+-2.0 >= $GTK_REQUIRED
libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
libebook-1.2
libxml-2.0
@@ -166,6 +165,8 @@ PKG_CHECK_MODULES(EMPATHY,
x11
])
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
# -----------------------------------------------------------
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 2a891bc72..5762f5c9e 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
$(EMPATHY_CFLAGS) \
+ $(GTK_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
@@ -130,6 +131,7 @@ nodist_libempathy_gtk_la_SOURCES =\
libempathy_gtk_la_LIBADD = \
$(EMPATHY_LIBS) \
+ $(GTK_LIBS) \
$(LIBNOTIFY_LIBS) \
$(ENCHANT_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index adc9bfb67..03564fe02 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -7,7 +7,8 @@ INCLUDES = \
$(NST_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
- $(EMPATHY_CFLAGS)
+ $(EMPATHY_CFLAGS) \
+ $(GTK_CFLAGS)
plugin_LTLIBRARIES = libnstempathy.la
diff --git a/src/Makefile.am b/src/Makefile.am
index eaac3c341..dc199c2f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/tools/flymake.mk
CPPFLAGS_COMMON = \
$(EMPATHY_CFLAGS) \
+ $(GTK_CFLAGS) \
$(ERROR_CFLAGS) \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"empathy\" \
@@ -24,6 +25,7 @@ LDADD = \
$(top_builddir)/extensions/libemp-extensions.la \
$(LIBNOTIFY_LIBS) \
$(EMPATHY_LIBS) \
+ $(GTK_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(WEBKIT_LIBS)
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 8fc19eb3e..bd3acea67 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -3,13 +3,15 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
$(EMPATHY_CFLAGS) \
+ $(GTK_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
LDADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
- $(EMPATHY_LIBS)
+ $(EMPATHY_LIBS) \
+ $(GTK_LIBS)
noinst_PROGRAMS = \
contact-manager \