Group all harddeps in one pkg-config call

We do not support GTK2 anymore, so there is no point in keeping those

6 files changed, 6 insertions, 26 deletions

diff --git a/configure.ac b/configure.ac
index 63e88ad3c..b2336892c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,10 @@ PKG_CHECK_MODULES(EMPATHY,
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    telepathy-logger-0.1 >= $TELEPATHY_LOGGER
    x11
+   gtk+-3.0 >= $GTK_REQUIRED
+   libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
+   libnotify >= $LIBNOTIFY_REQUIRED
+   gcr-3 >= $KEYRING_REQUIRED
 ])
 
 # -----------------------------------------------------------
@@ -175,15 +179,6 @@ if test x"$with_eds" = x"yes" ; then
 fi
 
 # -----------------------------------------------------------
-# GTK+
-# -----------------------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
-
-PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
-PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
-
-# -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
 
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index def25e357..a28ac9a00 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -8,14 +8,10 @@ AM_CPPFLAGS =                                           \
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
-	$(GTK_CFLAGS)				\
-	$(LIBNOTIFY_CFLAGS)				\
-	$(CANBERRA_CFLAGS) \
 	$(ENCHANT_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
 	$(GEOCLUE_CFLAGS)				\
-	$(GCR_CFLAGS)					\
-	$(MEEGO_CFLAGS)				\
+	$(MEEGO_CFLAGS)					\
 	$(WEBKIT_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index 03564fe02..adc9bfb67 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -7,8 +7,7 @@ INCLUDES =					\
 	$(NST_CFLAGS)				\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
-	$(EMPATHY_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(EMPATHY_CFLAGS)
 
 plugin_LTLIBRARIES = libnstempathy.la
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 66c1089e1..eedd6885c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/tools/flymake.mk
 CPPFLAGS_COMMON =					\
 	$(EMPATHY_CFLAGS)				\
 	$(EDS_CFLAGS)					\
-	$(GTK_CFLAGS)					\
 	$(ERROR_CFLAGS)					\
 	-I$(top_srcdir)                          	\
 	-DG_LOG_DOMAIN=\"empathy\"			\
@@ -15,7 +14,6 @@ CPPFLAGS_COMMON =					\
 AM_LDFLAGS = -lm
 AM_CPPFLAGS =						\
 	$(CPPFLAGS_COMMON)				\
-	$(LIBNOTIFY_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
 	$(WEBKIT_CFLAGS)				\
 	$(NULL)
@@ -24,9 +22,7 @@ LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
 	$(top_builddir)/extensions/libemp-extensions.la		\
-	$(LIBNOTIFY_LIBS)					\
 	$(EMPATHY_LIBS)						\
-	$(GTK_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
 	$(WEBKIT_LIBS)
 
@@ -46,7 +42,6 @@ libempathy_accounts_common_la_SOURCES =					\
 libempathy_accounts_common_la_LIBADD =					\
         $(top_builddir)/libempathy-gtk/libempathy-gtk.la		\
 	$(EDS_LIBS)							\
-        $(LIBNOTIFY_LIBS)						\
         $(EMPATHY_LIBS)							\
         $(LIBCHAMPLAIN_LIBS)						\
         $(WEBKIT_LIBS)							\
@@ -151,7 +146,6 @@ empathy_LDADD =								\
         $(top_builddir)/libempathy-gtk/libempathy-gtk.la		\
         $(top_builddir)/libempathy/libempathy.la			\
         $(top_builddir)/extensions/libemp-extensions.la			\
-        $(LIBNOTIFY_LIBS)						\
         $(EMPATHY_LIBS)							\
         $(LIBCHAMPLAIN_LIBS)						\
         $(WEBKIT_LIBS)							\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 577bb9091..a3bb71c31 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,6 @@ AM_CPPFLAGS =						\
 	-I$(top_srcdir)                          	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
-	$(GTK_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)				\
 	$(NULL)
@@ -22,7 +21,6 @@ LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
 	$(EMPATHY_LIBS)						\
-	$(GTK_LIBS)						\
 	$(NULL)
 
 TEST_PROGS =                                     \
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 258b86d45..24e674c6a 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS =						\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
 	$(EDS_CFLAGS)					\
-	$(GTK_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
@@ -12,7 +11,6 @@ LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
 	$(EMPATHY_LIBS)						\
-	$(GTK_LIBS)						\
 	$(EDS_LIBS)
 
 noinst_PROGRAMS =			\