Group all harddeps in one pkg-config call

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

diff --git a/configure.ac b/configure.ac
index 63e88ad3c445de816f3bf3f88513f441663ce4d1..b2336892c897bb9597e6b98a91d18cb37febab74 100644 (file)
--- 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
 ])
 
 # -----------------------------------------------------------
@@ -174,15 +178,6 @@ if test x"$with_eds" = x"yes" ; then
    AC_DEFINE(HAVE_EDS, 1, [Define if we have libebook])
 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 def25e357490b847c2df82b8ec7d89ed7af6a18a..a28ac9a003f51979b18c8dbd5b88141dafad9834 100644 (file)
--- 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 03564fe0236dafe3c5b7e7045109e81cc88e33a2..adc9bfb672d468f27b78ade10604e13e7faba28e 100644 (file)
--- 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 66c1089e1b5370c1d78aa973669ae071797034c0..eedd6885c75c0099e437be1a985b16d851c80210 100644 (file)
--- 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 577bb90914d3ff1f4af5ce48dd8e05fc9130dd89..a3bb71c31b7de2d5fbe2d36d51421afb8e8a2e8d 100644 (file)
--- 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 258b86d45a246729ac8a3222c44eada500b8d7cf..24e674c6ad7d4cd2bca319fc8e20b0d82b698b8b 100644 (file)
--- 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 =                      \