From 6bb67138079e8ef3457ee1fa07cebcb78b6049d6 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 17 Jan 2010 11:39:00 +0100 Subject: [PATCH] build: do not override gnulib-provided AM_CFLAGS options Avoid a warning from automake: lib/Makefile.am:23: AM_CFLAGS multiply defined in condition TRUE ... lib/gnulib.mk:30: ... `AM_CFLAGS' previously defined here lib/Makefile.am:18: `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 e58efa5b "build: enable warnings and -Werror.", but fortunately is not a bug, because the definition it would have overridden was always empty. --- lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 6b75ba4..0e31a45 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,4 +20,4 @@ include gnulib.mk noinst_HEADERS += cmpbuf.h prepargs.h libdiffutils_a_SOURCES += cmpbuf.c prepargs.c -AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) +AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)