[libgdata] build: Use AX_COMPILER_FLAGS
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgdata] build: Use AX_COMPILER_FLAGS
- Date: Wed, 27 May 2015 21:16:37 +0000 (UTC)
commit c55e32182522377c2af195fcee50e185b8a7246d
Author: Philip Withnall <philip tecnocode co uk>
Date: Wed May 27 21:51:38 2015 +0100
build: Use AX_COMPILER_FLAGS
Switch from GNOME_COMPILE_WARNINGS to AX_COMPILER_FLAGS. This integrates
better with CI systems, allows easy disabling of -Werror, and integrates
with AX_IS_RELEASE to automatically disable errors when building
releases.
https://wiki.gnome.org/Projects/GnomeCommon/Migration
Makefile.am | 31 +++++++-
configure.ac | 29 +-------
gdata/tests/Makefile.am | 3 +
m4/gnome-compiler-flags.m4 | 177 --------------------------------------------
4 files changed, 34 insertions(+), 206 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b64d573..af2bdea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -524,6 +524,7 @@ gdata_libgdata_la_LDFLAGS = \
-version-info $(GDATA_LT_VERSION) \
-export-symbols $(srcdir)/gdata/gdata.symbols \
-no-undefined \
+ $(WARN_LDFLAGS) \
$(AM_LDFLAGS)
EXTRA_DIST += gdata/gdata.symbols
@@ -562,7 +563,9 @@ gdata_GData_ GDATA_API_VERSION_MAJOR@_ GDATA_API_VERSION_MINOR@_gir_EXPORT_PACKA
gdata_GData_ GDATA_API_VERSION_MAJOR@_ GDATA_API_VERSION_MINOR@_gir_SCANNERFLAGS = \
--nsversion=$(GDATA_API_VERSION) \
--symbol-prefix=gdata \
- --c-include="gdata/gdata.h"
+ --c-include="gdata/gdata.h" \
+ $(WARN_SCANNERFLAGS) \
+ $(NULL)
INTROSPECTION_GIRS += gdata/GData-$(GDATA_API_VERSION).gir
@@ -643,6 +646,11 @@ demos_docs_list_docs_list_CFLAGS = \
$(AM_CFLAGS) \
$(NULL)
+demos_docs_list_docs_list_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
demos_docs_list_docs_list_LDADD = \
$(top_builddir)/gdata/libgdata.la \
$(GDATA_LIBS) \
@@ -672,6 +680,11 @@ demos_scrapbook_scrapbook_CFLAGS = \
$(AM_CFLAGS) \
$(NULL)
+demos_scrapbook_scrapbook_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
demos_scrapbook_scrapbook_LDADD = \
$(top_builddir)/gdata/libgdata.la \
$(GTK_LIBS) \
@@ -700,6 +713,11 @@ demos_freebase_freebase_cli_CFLAGS = \
$(AM_CFLAGS) \
$(NULL)
+demos_freebase_freebase_cli_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
demos_freebase_freebase_cli_LDADD = \
$(top_builddir)/gdata/libgdata.la \
$(GDATA_LIBS) \
@@ -727,6 +745,11 @@ demos_youtube_youtube_cli_CFLAGS = \
$(AM_CFLAGS) \
$(NULL)
+demos_youtube_youtube_cli_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
demos_youtube_youtube_cli_LDADD = \
$(top_builddir)/gdata/libgdata.la \
$(GDATA_LIBS) \
@@ -754,6 +777,11 @@ demos_calendar_calendar_cli_CFLAGS = \
$(AM_CFLAGS) \
$(NULL)
+demos_calendar_calendar_cli_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
demos_calendar_calendar_cli_LDADD = \
$(top_builddir)/gdata/libgdata.la \
$(GDATA_LIBS) \
@@ -768,7 +796,6 @@ EXTRA_DIST += \
gtk-doc.make \
libgdata.doap \
m4/ax_code_coverage.m4 \
- m4/gnome-compiler-flags.m4 \
glib-tap.mk \
tap-driver.sh \
tap-test \
diff --git a/configure.ac b/configure.ac
index 32a2d78..d376c75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,33 +193,8 @@ IT_PROG_INTLTOOL([0.40.0])
AX_CODE_COVERAGE
# General macros
-GNOME_COMPILE_WARNINGS([maximum],[
- -Wdeclaration-after-statement
- -Wextra
- -Winline
- -Wpacked
- -Wlarger-than-65500
- -Wmissing-declarations
- -Wmissing-format-attribute
- -Wmissing-noreturn
- -Wold-style-definition
- -Wsign-compare
- -Wstrict-aliasing=2
- -Wswitch-enum
- -Wundef
- -Wunsafe-loop-optimizations
- -Wwrite-strings
- -Wno-missing-field-initializers
- -Wno-unused-parameter
- -Wshadow
- -Wcast-align
- -Wformat-nonliteral
- -Wswitch-default
- -Waggregate-return
- -Wredundant-decls
- -Wunused-but-set-variable
- -Warray-bounds
-])
+AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS],[$ax_is_release],
+ [],[-Wunsafe-loop-optimizations])
GOBJECT_INTROSPECTION_CHECK([0.9.7])
diff --git a/gdata/tests/Makefile.am b/gdata/tests/Makefile.am
index 212ff7d..94482c4 100644
--- a/gdata/tests/Makefile.am
+++ b/gdata/tests/Makefile.am
@@ -33,6 +33,9 @@ AM_CFLAGS = \
$(GNOME_CFLAGS) \
$(UHTTPMOCK_CFLAGS) \
$(NULL)
+AM_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(NULL)
LDADD = \
libgdata-test.la \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]