[devhelp] build: Use AX_IS_RELEASE and AX_COMPILER_FLAGS



commit 8cae6f23d4ac547ce870ca3cefeb292b716ae633
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Nov 10 16:44:04 2016 -0600

    build: Use AX_IS_RELEASE and AX_COMPILER_FLAGS
    
    GNOME_COMPILER_FLAGS is deprecated and should not be used. Its
    replacement is AX_COMPILER_FLAGS. That expects AX_IS_RELEASE to be
    called first.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774069

 configure.ac    |    6 +++++-
 src/Makefile.am |    8 ++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e65a7e0..44378a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,6 @@
+AX_REQUIRE_DEFINED([AX_IS_RELEASE])
+AX_IS_RELEASE([git-directory])
+
 AC_PREREQ([2.64])
 AC_INIT([Devhelp],
         [3.22.1],
@@ -40,7 +43,8 @@ GLIB_GSETTINGS
 
 GOBJECT_INTROSPECTION_CHECK([1.30.0])
 
-GNOME_COMPILE_WARNINGS([maximum])
+AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS])
+AX_COMPILER_FLAGS
 
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
diff --git a/src/Makefile.am b/src/Makefile.am
index ca07bcb..d49394c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,9 @@ AM_CPPFLAGS =                                                 \
        -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES            \
        $(WARN_CFLAGS)
 
+AM_LDFLAGS =                                           \
+       $(WARN_LDFLAGS)
+
 bin_PROGRAMS = devhelp
 
 devhelp_SOURCES =                                      \
@@ -42,6 +45,9 @@ devhelp_LDADD =                                       \
        $(DEVHELP_LIBS)                                 \
         libdevhelp-3.la
 
+devhelp_LDFLAGS =                                      \
+       $(AM_LDFLAGS)
+
 lib_LTLIBRARIES = libdevhelp-3.la
 
 libdevhelp_public_headers =            \
@@ -112,6 +118,7 @@ libdevhelp_3_la_LIBADD =                            \
        $(LIBM)
 
 libdevhelp_3_la_LDFLAGS =                              \
+       $(AM_LDFLAGS)                                   \
        -no-undefined                                   \
        -version-info ${LIBDEVHELP_CURRENT}:${LIBDEVHELP_REVISION}:${LIBDEVHELP_AGE} \
        -export-symbols-regex ^dh_ \
@@ -147,6 +154,7 @@ Devhelp_3_0_gir_INCLUDES = Gtk-3.0 WebKit2-4.0
 Devhelp_3_0_gir_CFLAGS = $(INCLUDES)
 Devhelp_3_0_gir_LIBS = libdevhelp-3.la
 Devhelp_3_0_gir_FILES = $(introspection_sources)
+Devhelp_3_0_gir_SCANNERFLAGS = $(WARN_SCANNERFLAGS)
 INTROSPECTION_GIRS += Devhelp-3.0.gir
 
 girdir = $(datadir)/gir-1.0


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