From: Jim Meyering <meyering@redhat.com>
Date: Mon, 11 Jan 2010 10:51:13 +0000 (+0100)
Subject: build: do not override gnulib-provided AM_CFLAGS options
X-Git-Tag: v1.4~7
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=033dda0eeed5b886eb862ba6e12628f2e4011324;p=debian%2Fgzip

build: do not override gnulib-provided AM_CFLAGS options

Avoid a warning from automake:
lib/Makefile.am:24: AM_CFLAGS multiply defined in condition TRUE ...
lib/gnulib.mk:30: ... `AM_CFLAGS' previously defined here
lib/Makefile.am:20:   `lib/gnulib.mk' included from here

* lib/Makefile.am (AM_CFLAGS): Append $(WARN_CFLAGS) and
$(WERROR_CFLAGS), i.e., use "+=", not "=".
This was introduced via 2009-12-17 commit 0341fc22,
"build: with --enable-gcc-warnings, use -Werror",
but fortunately is not a bug, because the definition
it would have overridden was always empty.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e817fe7..6f4f55e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,7 +21,7 @@ include gnulib.mk
 
 libgzip_a_LIBADD += $(LIBOBJS)
 libgzip_a_DEPENDENCIES += $(LIBOBJS)
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+AM_CFLAGS += $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 match.$(OBJEXT): match.c
 	cp $(srcdir)/match.c _match.S