[epiphany/wip/autocrap: 16/37] Use AX_COMPILER_FLAGS instead of GNOME_COMPILE_WARNINGS
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/autocrap: 16/37] Use AX_COMPILER_FLAGS instead of GNOME_COMPILE_WARNINGS
- Date: Tue, 30 Jun 2015 15:39:47 +0000 (UTC)
commit d9a7d8e542357a321a49de4ce2b69855413bfd11
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Mon Jun 29 16:58:55 2015 -0500
Use AX_COMPILER_FLAGS instead of GNOME_COMPILE_WARNINGS
GNOME_COMPILE_WARNINGS has been deprecated for AX_COMPILER_FLAGS.
Behavior change: -Werror is not enabled by default for builds from git.
Disable by configuring with --disable-Werror. jhbuild and GNOME
Continuous will pass this by default. Werror will not be used for
tarball builds. This was the product of negotiation, intended to
encourage GNOME developers to fix warnings without causing needless
breakage for jhbuilders or for downstreams (since -Werror will not be
used for tarball builds).
Behavior change #2: We have a ton of new warnings to fix now.
https://wiki.gnome.org/Projects/GnomeCommon/Migration
configure.ac | 3 +--
embed/Makefile.am | 1 +
embed/web-extension/Makefile.am | 1 +
lib/Makefile.am | 1 +
lib/history/Makefile.am | 1 +
lib/widgets/Makefile.am | 1 +
src/Makefile.am | 5 ++++-
src/bookmarks/Makefile.am | 1 +
tests/Makefile.am | 2 ++
9 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9423793..8d8c99c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,8 +52,7 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
GLIB_GSETTINGS
AX_CHECK_ENABLE_DEBUG([yes])
-GNOME_COMPILE_WARNINGS([maximum])
-
+AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS])
AX_CODE_COVERAGE
WARN_CFLAGS="$WARN_CFLAGS -Wdeclaration-after-statement -Wno-deprecated-declarations -Wno-missing-prototypes"
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 6a9529b..09532a0 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -3,6 +3,7 @@ NULL =
SUBDIRS = web-extension
AM_CFLAGS = $(WARN_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS)
noinst_LTLIBRARIES = libephyembed.la
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index 2d1461b..124177a 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -1,4 +1,5 @@
AM_CFLAGS = $(WARN_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS)
webextension_LTLIBRARIES = libephywebextension.la
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c4f4201..1c8e3ee 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,7 @@
SUBDIRS = widgets egg history
AM_CFLAGS = $(WARN_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS)
noinst_LTLIBRARIES = libephymisc.la
diff --git a/lib/history/Makefile.am b/lib/history/Makefile.am
index 777f30d..4b7ce75 100644
--- a/lib/history/Makefile.am
+++ b/lib/history/Makefile.am
@@ -1,4 +1,5 @@
AM_CFLAGS = $(WARN_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS)
noinst_LTLIBRARIES = libephyhistory.la
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 873e979..c535600 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libephywidgets.la
AM_CFLAGS = $(WARN_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS)
BUILT_SOURCES = \
ephy-widgets-type-builtins.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index 1491ac6..6fe496f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = bookmarks
NULL =
AM_CFLAGS = $(WARN_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS)
noinst_LTLIBRARIES = libephymain.la
@@ -159,7 +160,9 @@ epiphany_CFLAGS = \
$(DEPENDENCIES_CFLAGS) \
$(AM_CFLAGS)
-epiphany_LDFLAGS = -dlopen self
+epiphany_LDFLAGS = \
+ -dlopen self \
+ $(AM_LDFLAGS)
epiphany_LDADD = \
libephymain.la \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index f11f43f..2f9637d 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libephybookmarks.la
AM_CFLAGS = $(WARN_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS)
INST_H_FILES = \
ephy-bookmarks.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 061e1bc..4409aea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -105,6 +105,8 @@ AM_CFLAGS = \
$(CODE_COVERAGE_CFLAGS) \
$(WARN_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS)
+
LDADD = \
$(top_builddir)/src/libephymain.la \
$(top_builddir)/src/bookmarks/libephybookmarks.la \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]