[totem-pl-parser] build: Port from GNOME_COMPILE_WARNINGS to AS_COMPILER_FLAGS
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem-pl-parser] build: Port from GNOME_COMPILE_WARNINGS to AS_COMPILER_FLAGS
- Date: Thu, 22 Dec 2016 15:25:23 +0000 (UTC)
commit 0d0fd19226bd8a519946e0a2857482bdd30c900e
Author: Philip Withnall <withnall endlessm com>
Date: Mon Dec 19 08:13:22 2016 +0000
build: Port from GNOME_COMPILE_WARNINGS to AS_COMPILER_FLAGS
The latter gives a more standardised set of default warnings, and
standardised control over -Werror using --disable-Werror (which can be
enabled by default for non-release builds, for example; and disabled by
default for buildbots).
https://wiki.gnome.org/Projects/GnomeCommon/Migration
https://bugzilla.gnome.org/show_bug.cgi?id=776259
configure.ac | 18 +-----------------
plparse/Makefile.am | 7 +++++--
plparse/tests/Makefile.am | 7 ++++++-
3 files changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c3dc8d6..5b115de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,23 +198,7 @@ AC_SUBST(TOTEM_PLPARSER_LIBS)
PKG_CHECK_MODULES([TOTEM_PLPARSER_MINI], [gio-2.0])
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_CXX_WARNINGS
-
-if test "$GCC" = "yes" ; then
- CFLAGS="\
- -Wall \
- -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
- -Wnested-externs -Wpointer-arith \
- -Wcast-align -Wsign-compare \
- -fno-strict-aliasing \
- $CFLAGS"
-fi
-
-AC_SUBST([AM_CPPFLAGS])
-AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_CXXFLAGS])
-AC_SUBST([AM_LDFLAGS])
+AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
GOBJECT_INTROSPECTION_CHECK([0.9.5])
diff --git a/plparse/Makefile.am b/plparse/Makefile.am
index 974264b..afefa3c 100644
--- a/plparse/Makefile.am
+++ b/plparse/Makefile.am
@@ -99,6 +99,7 @@ libtotem_plparser_la_LDFLAGS = \
-version-info $(PLPARSER_LT_VERSION) \
-export-symbols $(srcdir)/plparser.symbols \
-no-undefined \
+ $(WARN_LDFLAGS) \
$(CODE_COVERAGE_LDFLAGS) \
$(AM_LDFLAGS)
@@ -152,6 +153,7 @@ libtotem_plparser_mini_la_LDFLAGS = \
-version-info $(PLPARSER_LT_VERSION) \
-export-symbols $(srcdir)/plparser-mini.symbols \
-no-undefined \
+ $(WARN_LDFLAGS) \
$(CODE_COVERAGE_LDFLAGS) \
$(AM_LDFLAGS)
@@ -186,14 +188,15 @@ if HAVE_QUVI
libexecsubdir = $(libexecdir)/totem-pl-parser/
libexecsub_PROGRAMS = 99-totem-pl-parser-videosite
99_totem_pl_parser_videosite_SOURCES = videosite-parser.c
-99_totem_pl_parser_videosite_CFLAGS = $(QUVI_CFLAGS) -DLIBEXECDIR=\""$(libexecdir)"\"
+99_totem_pl_parser_videosite_CFLAGS = $(QUVI_CFLAGS) $(WARN_CFLAGS) -DLIBEXECDIR=\""$(libexecdir)"\"
99_totem_pl_parser_videosite_LDADD = $(QUVI_LIBS)
+99_totem_pl_parser_videosite_LDFLAGS = $(WARN_LDFLAGS)
endif
# Introspection
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(builddir) --warn-all
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(builddir) $(WARN_SCANNERFLAGS)
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
diff --git a/plparse/tests/Makefile.am b/plparse/tests/Makefile.am
index 2102092..b15818b 100644
--- a/plparse/tests/Makefile.am
+++ b/plparse/tests/Makefile.am
@@ -26,6 +26,9 @@ parser_CFLAGS = \
$(DBUS_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS)
+parser_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS)
TEST_PROGS += disc
disc_SOURCES = disc.c
@@ -41,7 +44,9 @@ disc_CFLAGS = \
$(WARN_CFLAGS) \
$(TOTEM_PLPARSER_CFLAGS)\
$(AM_CFLAGS)
-disc_LDFLAGS = $(AM_LDFLAGS)
+disc_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS)
EXTRA_DIST = \
541405.xml \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]