aboutsummaryrefslogtreecommitdiffstats
path: root/epan/nghttp2
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2015-11-27 02:28:17 +0000
committerJoão Valverde <j@v6e.pt>2016-01-28 18:13:48 +0000
commit265a41e14da6b3ebf1e49e726eee62d1372110bf (patch)
treef1a524f8e66ebd43691de84649f231f32ee125f6 /epan/nghttp2
parent97a1a50e200a6c50e0014dde7e8ec932c30190a1 (diff)
autotools: Don't use "user variables" to set build flags
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/nghttp2')
-rw-r--r--epan/nghttp2/Makefile.am9
1 files changed, 2 insertions, 7 deletions
diff --git a/epan/nghttp2/Makefile.am b/epan/nghttp2/Makefile.am
index 8256a3dca4..54d964b7b0 100644
--- a/epan/nghttp2/Makefile.am
+++ b/epan/nghttp2/Makefile.am
@@ -19,15 +19,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-if HAVE_WARNINGS_AS_ERRORS
-AM_CFLAGS = -Werror
-endif
-
include Makefile.common
+include $(top_srcdir)/Makefile.am.inc
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- $(LIBNGHTTP2_CFLAGS)
+AM_CPPFLAGS += $(LIBNGHTTP2_CFLAGS)
noinst_LTLIBRARIES = libnghttp2.la