* Makefile.am (syslex.o): Use $(NO_WERROR) not -Wno-error.

	(sysinfo.o): Likewise.
	* Makefile.in: Regenerate.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 05a696a..586c3fb 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-20  Ben Elliston  <bje@au.ibm.com>
+
+       * Makefile.am (syslex.o): Use $(NO_WERROR) not -Wno-error.
+       (sysinfo.o): Likewise.
+       * Makefile.in: Regenerate.
+
 2009-11-19  Ben Elliston  <bje@au.ibm.com>
 
        * arlex.l: Enable noinput, nounput flex options.

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 5d64c1a..db7a773 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -255,16 +255,16 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
 
 syslex.o: syslex.c sysinfo.h config.h
        if [ -r syslex.c ]; then \
-         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -Wno-error syslex.c ; \
+         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
        else \
-         $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -Wno-error $(srcdir)/syslex.c ;\
+         $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
        fi
 
 sysinfo.o: sysinfo.c
        if [ -r sysinfo.c ]; then \
-         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -Wno-error sysinfo.c ; \
+         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
        else \
-         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -Wno-error $(srcdir)/sysinfo.c ; \
+         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
        fi
 
 bin2c$(EXEEXT_FOR_BUILD):

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 9b8725d..dcda20f 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1197,16 +1197,16 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
 
 syslex.o: syslex.c sysinfo.h config.h
        if [ -r syslex.c ]; then \
-         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -Wno-error syslex.c ; \
+         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
        else \
-         $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -Wno-error $(srcdir)/syslex.c ;\
+         $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
        fi
 
 sysinfo.o: sysinfo.c
        if [ -r sysinfo.c ]; then \
-         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -Wno-error sysinfo.c ; \
+         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
        else \
-         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -Wno-error $(srcdir)/sysinfo.c ; \
+         $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
        fi
 
 bin2c$(EXEEXT_FOR_BUILD):