diff options
| author | Jim Meyering <meyering@redhat.com> | 2010-01-17 11:39:00 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-02-04 20:03:03 +0100 |
| commit | 6bb67138079e8ef3457ee1fa07cebcb78b6049d6 (patch) | |
| tree | 38b3d2abb3f43f88f9cffee604937c6d0237c62d /lib | |
| parent | f51320402bf1342d47199f7dfe37add89092ee5b (diff) | |
| download | diffutils-6bb67138079e8ef3457ee1fa07cebcb78b6049d6.tar.gz | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
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) |