[gnome-calculator] Stop hardcoding glib version passed to --target-glib



commit e8af51678ee087cc905c7062fa84eedc0b942701
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun May 10 18:28:24 2015 -0500

    Stop hardcoding glib version passed to --target-glib
    
    We depend on glib 2.40, so there's no value in hardcoding a lower
    dependency all over the place.

 configure.ac      |    2 ++
 lib/Makefile.am   |    2 +-
 src/Makefile.am   |    4 ++--
 tests/Makefile.am |    6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 16c01c6..90ab7f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,8 @@ GLIB_REQUIRED=2.40.0
 GTK_REQUIRED=3.11.6
 GTKSOURCEVIEW_REQUIRED=3.15.1
 
+AC_SUBST([GLIB_REQUIRED])
+
 # FIXME We link to it too, so this check needs to be better....
 AC_CHECK_HEADER([mpfr.h], [], [AC_MSG_ERROR([The mpfr header is missing. Please, install mpfr])])
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4f1f599..5f3b9c5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,7 +25,7 @@ libcalculator_la_SOURCES = \
        unit.vala
 
 libcalculator_la_VALAFLAGS = \
-       --target-glib 2.32 \
+       --target-glib $(GLIB_REQUIRED) \
        --pkg posix \
        --pkg gtksourceview-3.0 \
        --pkg libxml-2.0 \
diff --git a/src/Makefile.am b/src/Makefile.am
index b8dde9f..644258c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ gnome_calculator_SOURCES = \
        $(BUILT_SOURCES)
 
 gnome_calculator_VALAFLAGS = \
-       --target-glib 2.32 \
+       --target-glib $(GLIB_REQUIRED) \
        --pkg posix \
        --pkg gtk+-3.0 \
        --pkg gtksourceview-3.0 \
@@ -49,7 +49,7 @@ gcalccmd_SOURCES = \
        gcalccmd.vala
 
 gcalccmd_VALAFLAGS = \
-       --target-glib 2.32 \
+       --target-glib $(GLIB_REQUIRED) \
        --pkg posix \
        --pkg gio-2.0 \
        --pkg gtksourceview-3.0 \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac4bb18..90e5676 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,7 @@ test_number_SOURCES = \
        test-number.vala
 
 test_number_VALAFLAGS = \
-       --target-glib 2.32 \
+       --target-glib $(GLIB_REQUIRED) \
        --pkg posix \
        --pkg gio-2.0 \
        --pkg gtksourceview-3.0 \
@@ -27,7 +27,7 @@ test_equation_SOURCES = \
        test-equation.vala
 
 test_equation_VALAFLAGS = \
-       --target-glib 2.32 \
+       --target-glib $(GLIB_REQUIRED) \
        --pkg posix \
        --pkg gio-2.0 \
        --pkg gtksourceview-3.0 \
@@ -44,7 +44,7 @@ test_serializer_SOURCES = \
        test-serializer.vala
 
 test_serializer_VALAFLAGS = \
-       --target-glib 2.32 \
+       --target-glib $(GLIB_REQUIRED) \
        --pkg posix \
        --pkg gio-2.0 \
        --pkg gtksourceview-3.0 \


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