diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 13 | ||||
| -rw-r--r-- | opcodes/Makefile.am | 6 | ||||
| -rw-r--r-- | opcodes/Makefile.in | 10 | ||||
| -rwxr-xr-x | opcodes/configure | 45 | ||||
| -rw-r--r-- | opcodes/configure.in | 12 |
5 files changed, 41 insertions, 45 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 800df07..0b206d5 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,11 +1,20 @@ +2014-07-04 Alan Modra <amodra@gmail.com> + + * configure.in: Include bfd/version.m4. + (AC_INIT, AM_INIT_AUTOMAKE): Use modern form. + (BFD_VERSION): Delete. + * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Remove bfd/configure.in. + * configure: Regenerate. + * Makefile.in: Regenerate. + 2014-07-01 Barney Stratford <barney_stratford@fastmail.fm> Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com> Pitchumani Sivanupandi <pitchumani.s@atmel.com> Soundararajan <Sounderarajan.D@atmel.com> * avr-dis.c (avr_operand): Handle constraint j for 16 bit lds/sts. - (print_insn_avr): Do not select opcode if insn ISA is avrtiny and machine - is not avrtiny. + (print_insn_avr): Do not select opcode if insn ISA is avrtiny and + machine is not avrtiny. 2014-06-26 Philippe De Muyter <phdm@macqel.be> diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 9ff6a38..4acc436 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -294,10 +294,8 @@ ALL_MACHINES = $(TARGET_LIBOPCODES_CFILES:.c=.lo) 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 \ - $(BFDDIR)/development.sh +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(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 f83f1d9..6079002 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -75,7 +75,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/warnings.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/../bfd/version.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -567,11 +568,8 @@ CFILES = \ ALL_MACHINES = $(TARGET_LIBOPCODES_CFILES:.c=.lo) 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 \ - $(BFDDIR)/development.sh - +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(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 40a2b85..b3c8931 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64. +# Generated by GNU Autoconf 2.64 for opcodes 2.24.51. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software @@ -554,12 +554,12 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= -PACKAGE_URL= +PACKAGE_NAME='opcodes' +PACKAGE_TARNAME='opcodes' +PACKAGE_VERSION='2.24.51' +PACKAGE_STRING='opcodes 2.24.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="z8k-dis.c" # Factoring default headers for most tests. @@ -818,7 +818,7 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1319,7 +1319,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures opcodes 2.24.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1367,7 +1367,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --docdir=DIR documentation root [DATAROOTDIR/doc/opcodes] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1389,7 +1389,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of opcodes 2.24.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1495,7 +1497,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +opcodes configure 2.24.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1905,7 +1907,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by opcodes $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3213,11 +3215,6 @@ if test "$ac_res" != no; then : fi -# We currently only use the version number for the name of any shared -# library. For user convenience, we always use the same version -# number that BFD is using. -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` - am__api_version='1.11' # Find a good install program. We prefer a C program (faster), @@ -3717,8 +3714,8 @@ fi # Define the identity of the package. - PACKAGE=opcodes - VERSION=${BFD_VERSION} + PACKAGE='opcodes' + VERSION='2.24.51' cat >>confdefs.h <<_ACEOF @@ -11149,7 +11146,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11152 "configure" +#line 11149 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11255,7 +11252,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11258 "configure" +#line 11255 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13212,7 +13209,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by opcodes $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13276,7 +13273,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +opcodes config.status 2.24.51 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/opcodes/configure.in b/opcodes/configure.in index 3ffcaa0..b93e855 100644 --- a/opcodes/configure.in +++ b/opcodes/configure.in @@ -18,20 +18,14 @@ dnl <http://www.gnu.org/licenses/>. dnl AC_PREREQ(2.59) -AC_INIT +m4_include([../bfd/version.m4]) +AC_INIT([opcodes], BFD_VERSION) AC_CONFIG_SRCDIR([z8k-dis.c]) AC_CANONICAL_TARGET AC_ISC_POSIX -# We currently only use the version number for the name of any shared -# library. For user convenience, we always use the same version -# number that BFD is using. -changequote(,)dnl -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` -changequote([,])dnl - -AM_INIT_AUTOMAKE(opcodes, ${BFD_VERSION}) +AM_INIT_AUTOMAKE AC_PROG_CC AC_GNU_SOURCE |