[libgnome-games-support] build: be more verbose with PKG_CHECK_MODULES



commit 5bef1565adddf8a71a0bace8efa4bb4782ca8167
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Aug 22 17:59:19 2016 -0500

    build: be more verbose with PKG_CHECK_MODULES
    
    Pretty sure this is how it's intended to be used; the configure output
    is nonsensical otherwise. And this style in general helps to avoid
    overlinking, though that's hardly a problem here.

 configure.ac      |   10 ++++------
 games/Makefile.am |   10 ++++++++--
 tests/Makefile.am |   10 +++++++---
 3 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d21792f..5f97c44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,12 +32,10 @@ LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
 AX_REQUIRE_DEFINED([PKG_CHECK_MODULES])
-PKG_CHECK_MODULES([LIBGNOME_GAMES_SUPPORT], [
-  glib-2.0 >= 2.40
-  gio-2.0 >= 2.40
-  gtk+-3.0 >= 3.19.2
-  gee-0.8
-])
+PKG_CHECK_MODULES([GEE], [gee-0.8])
+PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.40])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40])
+PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.19.2])
 
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.19.8])
diff --git a/games/Makefile.am b/games/Makefile.am
index d646941..7bca713 100644
--- a/games/Makefile.am
+++ b/games/Makefile.am
@@ -18,14 +18,20 @@ libgnome_games_support_@LIBGNOME_GAMES_SUPPORT_API_VERSION@_la_CPPFLAGS = \
        -I$(top_srcdir)/include                         \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"        \
        -DLOCALEDIR=\"$(localedir)\"                    \
-       $(LIBGNOME_GAMES_SUPPORT_CFLAGS)
+       $(GEE_CFLAGS)                                   \
+       $(GIO_CFLAGS)                                   \
+       $(GLIB_CFLAGS)                                  \
+       $(GTK_CFLAGS)
 
 libgnome_games_support_@LIBGNOME_GAMES_SUPPORT_API_VERSION@_la_LDFLAGS = \
        -version-info $(LIBGNOME_GAMES_SUPPORT_LT_VERSION) \
        -no-undefined
 
 libgnome_games_support_@LIBGNOME_GAMES_SUPPORT_API_VERSION@_la_LIBADD = \
-       $(LIBGNOME_GAMES_SUPPORT_LIBS)
+       $(GEE_LIBS)     \
+       $(GIO_LIBS)     \
+       $(GLIB_LIBS)    \
+       $(GTK_LIBS)
 
 libgnome_games_support_@LIBGNOME_GAMES_SUPPORT_API_VERSION@_la_VALAFLAGS = \
        --pkg glib-2.0                          \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c837f70..8e9880a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,12 +10,16 @@ test_scores_CFLAGS = \
        -w
 
 test_scores_CPPFLAGS = \
-       -I$(top_srcdir)/games           \
-       $(LIBGNOME_GAMES_SUPPORT_CFLAGS)
+       -I$(top_srcdir)/games   \
+       $(GEE_CFLAGS)           \
+       $(GLIB_CFLAGS)          \
+       $(GTK_CFLAGS)
 
 test_scores_LDADD = \
        $(top_builddir)/games/libgnome-games-support-$(LIBGNOME_GAMES_SUPPORT_API_VERSION).la   \
-       $(LIBGNOME_GAMES_SUPPORT_LIBS)
+       $(GEE_LIBS)     \
+       $(GLIB_LIBS)    \
+       $(GTK_LIBS)
 
 test_scores_VALAFLAGS = \
        --pkg gee-0.8   \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]