diff options
Diffstat (limited to 'opcodes')
-rw-r--r-- | opcodes/ChangeLog | 6 | ||||
-rw-r--r-- | opcodes/Makefile.am | 3 | ||||
-rw-r--r-- | opcodes/Makefile.in | 4 | ||||
-rwxr-xr-x | opcodes/configure | 7 |
4 files changed, 16 insertions, 4 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index ce5a204..499ec64 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2014-06-05 Joel Brobecker <brobecker@adacore.com> + + * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on + bfd's development.sh. + * Makefile.in, configure: Regenerate. + 2014-06-03 Nick Clifton <nickc@redhat.com> * msp430-dis.c (msp430_doubleoperand): Use extension_word to diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index de98c28..9ff6a38 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -296,7 +296,8 @@ OFILES = @BFD_MACHINES@ # We should reconfigure whenever bfd/configure.in changes, because # that's where the version number in Makefile comes from. -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ + $(BFDDIR)/development.sh AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 5995f1c..f83f1d9 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -569,7 +569,9 @@ OFILES = @BFD_MACHINES@ # We should reconfigure whenever bfd/configure.in changes, because # that's where the version number in Makefile comes from. -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ + $(BFDDIR)/development.sh + AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # It's desirable to list ../bfd/libbfd.la in DEPENDENCIES and LIBADD. diff --git a/opcodes/configure b/opcodes/configure index 9379bbf..40a2b85 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -11504,6 +11504,9 @@ esac fi +# Set the 'development' global. +. $srcdir/../bfd/development.sh + GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11538,8 +11541,8 @@ case "${host}" in *) ;; esac -# Enable -Werror by default when using gcc -if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then +# Enable -Werror by default when using gcc. Turn it off for releases. +if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then ERROR_ON_WARNING=yes fi |