From 2e98a7bd882356a23076ad4a51a251d9ab1ce070 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 4 Jul 2014 11:35:16 +0930 Subject: [PATCH] Use modern AC_INIT in configure.in This removes usage of the obsolete AC_INIT and AM_INIT_AUTOMAKE in all binutils configure.in files. The BFD version is now in bfd/version.m4 rather than bfd/configure.in, which allows automake to automatically track this dependency. bfd/ * version.m4: New file. * configure.in: Include version.m4. (AC_INIT): Update. * Makefile.am (RELEASE): Delete. (bfdver.h): Depend on development.sh, use instead of RELEASE. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. opcodes/ * 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. binutils/ * 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. * doc/Makefile.in: Regenerate. gas/ * configure.in: Include bfd/version.m4. (AC_INIT, AM_INIT_AUTOMAKE): Use modern form. (BFD_VERSION): Delete. * configure.com: Get bfd version from bfd/version.m4. * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Remove bfd/configure.in. * configure: Regenerate. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. gprof/ * 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. ld/ * 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. --- bfd/ChangeLog | 10 +++++++++ bfd/Makefile.am | 8 +++---- bfd/Makefile.in | 10 ++++----- bfd/configure.in | 3 ++- bfd/doc/Makefile.in | 2 +- bfd/version.m4 | 1 + binutils/ChangeLog | 10 +++++++++ binutils/Makefile.am | 6 ++---- binutils/Makefile.in | 10 ++++----- binutils/configure | 41 ++++++++++++++++++------------------ binutils/configure.in | 8 +++---- binutils/doc/Makefile.in | 3 ++- gas/ChangeLog | 17 +++++++++++++-- gas/Makefile.am | 6 +++--- gas/Makefile.in | 8 +++---- gas/configure | 41 ++++++++++++++++++------------------ gas/configure.com | 8 +++---- gas/configure.in | 8 +++---- gas/doc/Makefile.in | 2 +- gprof/ChangeLog | 9 ++++++++ gprof/Makefile.am | 6 ++---- gprof/Makefile.in | 10 ++++----- gprof/configure | 41 ++++++++++++++++++------------------ gprof/configure.in | 8 +++---- ld/ChangeLog | 9 ++++++++ ld/Makefile.am | 7 +++---- ld/Makefile.in | 10 ++++----- ld/configure | 41 ++++++++++++++++++------------------ ld/configure.in | 8 +++---- opcodes/ChangeLog | 13 ++++++++++-- opcodes/Makefile.am | 6 ++---- opcodes/Makefile.in | 10 ++++----- opcodes/configure | 45 +++++++++++++++++++--------------------- opcodes/configure.in | 12 +++-------- 34 files changed, 235 insertions(+), 202 deletions(-) create mode 100644 bfd/version.m4 diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1218fc9700..064d5aee16 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2014-07-04 Alan Modra + + * version.m4: New file. + * configure.in: Include version.m4. + (AC_INIT): Update. + * Makefile.am (RELEASE): Delete. + (bfdver.h): Depend on development.sh, use instead of RELEASE. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + 2014-07-02 Alan Modra * elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Clear diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 595c4893d6..72ee0bfa43 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -20,9 +20,6 @@ AUTOMAKE_OPTIONS = 1.11 no-dist foreign ACLOCAL_AMFLAGS = -I . -I .. -I ../config -# Uncomment the following line when doing a release. -# RELEASE=y - INCDIR = $(srcdir)/../include CSEARCH = -I. -I$(srcdir) -I$(INCDIR) @@ -1027,14 +1024,15 @@ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion -bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in +bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ bfd_version_string="\"$(VERSION)\"" ;\ bfd_soversion="$(VERSION)" ;\ bfd_version_package="\"$(PKGVERSION)\"" ;\ report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ - if test "x$(RELEASE)" = x ; then \ + . $(srcdir)/development.sh ;\ + if test "$$development" = true ; then \ bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 2ea8516501..807cc9865c 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -80,7 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ $(top_srcdir)/bfd.m4 $(top_srcdir)/warning.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/zlib.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/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 \ @@ -337,9 +337,6 @@ top_srcdir = @top_srcdir@ wordsize = @wordsize@ AUTOMAKE_OPTIONS = 1.11 no-dist foreign ACLOCAL_AMFLAGS = -I . -I .. -I ../config - -# Uncomment the following line when doing a release. -# RELEASE=y INCDIR = $(srcdir)/../include CSEARCH = -I. -I$(srcdir) -I$(INCDIR) SUBDIRS = doc po @@ -2087,14 +2084,15 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h touch stmp-lcoff-h -bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in +bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ bfd_version_string="\"$(VERSION)\"" ;\ bfd_soversion="$(VERSION)" ;\ bfd_version_package="\"$(PKGVERSION)\"" ;\ report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ - if test "x$(RELEASE)" = x ; then \ + . $(srcdir)/development.sh ;\ + if test "$$development" = true ; then \ bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ diff --git a/bfd/configure.in b/bfd/configure.in index 2cc44990e6..017304f455 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -18,7 +18,8 @@ dnl . dnl AC_PREREQ(2.59) -AC_INIT([bfd], [2.24.51]) +m4_include([version.m4]) +AC_INIT([bfd], BFD_VERSION) AC_CONFIG_SRCDIR([libbfd.c]) AC_CANONICAL_TARGET diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index 77e837cf33..944dee808c 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -76,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ $(top_srcdir)/bfd.m4 $(top_srcdir)/warning.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/zlib.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/version.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs diff --git a/bfd/version.m4 b/bfd/version.m4 new file mode 100644 index 0000000000..e032e680ea --- /dev/null +++ b/bfd/version.m4 @@ -0,0 +1 @@ +m4_define([BFD_VERSION], [2.24.51]) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c5a5c20cbd..076ecc9268 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,13 @@ +2014-07-04 Alan Modra + + * 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. + * doc/Makefile.in: Regenerate. + 2014-07-03 Tristan Gingold * doc/binutils.texi: Clarify addr2line output. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index aca2610f60..7f5f0c4fc9 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -512,10 +512,8 @@ EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ diststuff: $(EXTRA_DIST) info all: info -# We extract version from bfd/configure.in, make sure to rerun configure -# when BFD's version changes. -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(BFDDIR)/development.sh +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak embedspu diff --git a/binutils/Makefile.in b/binutils/Makefile.in index c9e9e38239..456c69e780 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -91,7 +91,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/progtest.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 \ @@ -614,11 +615,8 @@ EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ mcparse.h mcparse.c embedspu.sh -# We extract version from bfd/configure.in, make sure to rerun configure -# when BFD's version changes. -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(BFDDIR)/development.sh - +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak embedspu MOSTLYCLEANFILES = sysinfo$(EXEEXT_FOR_BUILD) bin2c$(EXEEXT_FOR_BUILD) \ binutils.log binutils.sum abcdefgh* diff --git a/binutils/configure b/binutils/configure index 1272e530a9..6e26e52ddd 100755 --- a/binutils/configure +++ b/binutils/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 binutils 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='binutils' +PACKAGE_TARNAME='binutils' +PACKAGE_VERSION='2.24.51' +PACKAGE_STRING='binutils 2.24.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="ar.c" # Factoring default headers for most tests. @@ -831,7 +831,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}' @@ -1332,7 +1332,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 binutils 2.24.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1380,7 +1380,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/binutils] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1402,7 +1402,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of binutils 2.24.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1520,7 +1522,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +binutils configure 2.24.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1930,7 +1932,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 binutils $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3238,7 +3240,6 @@ if test "$ac_res" != no; then : fi -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), @@ -3738,8 +3739,8 @@ fi # Define the identity of the package. - PACKAGE=binutils - VERSION=${BFD_VERSION} + PACKAGE='binutils' + VERSION='2.24.51' cat >>confdefs.h <<_ACEOF @@ -11218,7 +11219,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11221 "configure" +#line 11222 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11324,7 +11325,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11327 "configure" +#line 11328 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14738,7 +14739,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 binutils $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14802,7 +14803,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +binutils 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/binutils/configure.in b/binutils/configure.in index f3e6130989..ff0d4dcd0b 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -18,16 +18,14 @@ dnl . dnl AC_PREREQ(2.59) -AC_INIT +m4_include([../bfd/version.m4]) +AC_INIT([binutils], BFD_VERSION) AC_CONFIG_SRCDIR(ar.c) AC_CANONICAL_TARGET AC_ISC_POSIX -changequote(,)dnl -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` -changequote([,])dnl -AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION}) +AM_INIT_AUTOMAKE AC_PROG_CC AC_GNU_SOURCE diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 9e22548594..542a55972c 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -74,7 +74,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/progtest.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) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs diff --git a/gas/ChangeLog b/gas/ChangeLog index e65aa83106..c9adf375f7 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,14 @@ +2014-07-04 Alan Modra + + * configure.in: Include bfd/version.m4. + (AC_INIT, AM_INIT_AUTOMAKE): Use modern form. + (BFD_VERSION): Delete. + * configure.com: Get bfd version from bfd/version.m4. + * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Remove bfd/configure.in. + * configure: Regenerate. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + 2014-07-01 Barney Stratford Senthil Kumar Selvaraj Pitchumani Sivanupandi @@ -7,9 +18,11 @@ Add avrtiny arch devices attiny4, attiny5, attiny9, attiny10, attiny20 and attiny40. (md_show_usage): Add avrtiny arch in usage message. - (avr_operand): validate and issue error for invalid register for avrtiny. + (avr_operand): validate and issue error for invalid register for + avrtiny. add new reloc exp for 16 bit lds/sts instruction. - (md_apply_fix): check 16 bit lds/sts operand for out of range and encode. + (md_apply_fix): check 16 bit lds/sts operand for out of range and + encode. (md_assemble): check ISA for arch and issue diagnostic. * NEWS: Mention new support. * doc/c-avr.texi: Document support for avrtiny architecture. diff --git a/gas/Makefile.am b/gas/Makefile.am index 669ab19828..5727c75fbc 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -693,6 +693,6 @@ de-stage3: - (cd stage3 ; rm -f as$(EXEEXT) ; mv -f * ..) - rmdir stage3 -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(srcdir)/configure.tgt \ - $(BFDDIR)/development.sh +# Reconfigure if configure.tgt changes. +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.tgt $(BFDDIR)/development.sh diff --git a/gas/Makefile.in b/gas/Makefile.in index 2ca56df4ad..93d01ce5b0 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -81,7 +81,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(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 \ @@ -677,10 +677,10 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core \ testsuite/site.exp site.bak site.exp stage stage1 stage2 against = stage2 -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(srcdir)/configure.tgt \ - $(BFDDIR)/development.sh +# Reconfigure if configure.tgt changes. +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.tgt $(BFDDIR)/development.sh all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/gas/configure b/gas/configure index 1e1086f674..3dee8f1b44 100755 --- a/gas/configure +++ b/gas/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 gas 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='gas' +PACKAGE_TARNAME='gas' +PACKAGE_VERSION='2.24.51' +PACKAGE_STRING='gas 2.24.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="as.h" # Factoring default headers for most tests. @@ -819,7 +819,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}' @@ -1320,7 +1320,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 gas 2.24.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1368,7 +1368,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/gas] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1390,7 +1390,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of gas 2.24.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1503,7 +1505,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +gas configure 2.24.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1913,7 +1915,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 gas $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3221,7 +3223,6 @@ if test "$ac_res" != no; then : fi -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), @@ -3721,8 +3722,8 @@ fi # Define the identity of the package. - PACKAGE=gas - VERSION=${BFD_VERSION} + PACKAGE='gas' + VERSION='2.24.51' cat >>confdefs.h <<_ACEOF @@ -11201,7 +11202,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11204 "configure" +#line 11205 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11307,7 +11308,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11310 "configure" +#line 11311 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14962,7 +14963,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 gas $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15026,7 +15027,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +gas 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/gas/configure.com b/gas/configure.com index 982d3318e2..ceb50c2b67 100644 --- a/gas/configure.com +++ b/gas/configure.com @@ -185,17 +185,17 @@ $ create config-vms.in /* Version number of package */ $! -$! Get VERSION from ../bfd/configure.in +$! Get VERSION from ../bfd/version.m4 $! $ edit/tpu/nojournal/nosection/nodisplay/command=sys$input $DECK set (success, off); - mfile := CREATE_BUFFER("mfile", "[-.bfd]configure.in"); - match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, mfile); + mfile := CREATE_BUFFER("mfile", "[-.bfd]version.m4"); + match_pos := SEARCH_QUIETLY('m4_define([BFD_VERSION], [', FORWARD, EXACT, mfile); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); ERASE(match_pos); - vers := CURRENT_LINE-")"; + vers := CURRENT_LINE-"])"; ELSE; vers := "unknown"; ENDIF; diff --git a/gas/configure.in b/gas/configure.in index b9f9a98820..cc4fc54d46 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -21,7 +21,8 @@ dnl . dnl dnl v2.5 needed for --bindir et al AC_PREREQ(2.59) -AC_INIT +m4_include([../bfd/version.m4]) +AC_INIT([gas], BFD_VERSION) AC_CONFIG_SRCDIR(as.h) dnl Autoconf 2.57 will find the aux dir without this. However, unless @@ -31,10 +32,7 @@ AC_CONFIG_AUX_DIR(..) AC_CANONICAL_TARGET AC_ISC_POSIX -changequote(,)dnl -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` -changequote([,])dnl -AM_INIT_AUTOMAKE(gas, ${BFD_VERSION}) +AM_INIT_AUTOMAKE AC_PROG_CC AC_GNU_SOURCE diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index c51f99c31b..a67a558bdb 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -72,7 +72,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/../bfd/version.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs diff --git a/gprof/ChangeLog b/gprof/ChangeLog index bfb9edfc42..f4128c8960 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,12 @@ +2014-07-04 Alan Modra + + * 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-06-05 Joel Brobecker * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 2daefac2c8..ef54c3858f 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -58,10 +58,8 @@ EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS) diststuff: $(BUILT_SOURCES) info $(man_MANS) -# We extract version from bfd/configure.in, make sure to rerun configure -# when BFD's version changes. -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(BFDDIR)/development.sh +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh # This empty rule is a hack against gmake patched by Apple. %.o:%.m diff --git a/gprof/Makefile.in b/gprof/Makefile.in index 1706ba7035..7aada8f0f4 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -74,7 +74,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/warning.m4 \ $(top_srcdir)/../config/progtest.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 \ @@ -323,11 +324,8 @@ noinst_HEADERS = \ BUILT_SOURCES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS) -# We extract version from bfd/configure.in, make sure to rerun configure -# when BFD's version changes. -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(BFDDIR)/development.sh - +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh POTFILES = $(sources) $(noinst_HEADERS) MANCONF = -Dman TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS) diff --git a/gprof/configure b/gprof/configure index 3d6b415931..45e6941825 100755 --- a/gprof/configure +++ b/gprof/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 gprof 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='gprof' +PACKAGE_TARNAME='gprof' +PACKAGE_VERSION='2.24.51' +PACKAGE_STRING='gprof 2.24.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="gprof.c" # Factoring default headers for most tests. @@ -798,7 +798,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}' @@ -1299,7 +1299,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 gprof 2.24.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1347,7 +1347,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/gprof] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1369,7 +1369,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of gprof 2.24.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1474,7 +1476,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +gprof configure 2.24.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1839,7 +1841,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 gprof $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3147,7 +3149,6 @@ if test "$ac_res" != no; then : fi -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), @@ -3647,8 +3648,8 @@ fi # Define the identity of the package. - PACKAGE=gprof - VERSION=${BFD_VERSION} + PACKAGE='gprof' + VERSION='2.24.51' cat >>confdefs.h <<_ACEOF @@ -11131,7 +11132,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11134 "configure" +#line 11135 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11237,7 +11238,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11240 "configure" +#line 11241 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12616,7 +12617,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 gprof $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12680,7 +12681,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +gprof 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/gprof/configure.in b/gprof/configure.in index 20c2a57534..583ad244cc 100644 --- a/gprof/configure.in +++ b/gprof/configure.in @@ -17,16 +17,14 @@ dnl along with this program; see the file COPYING3. If not see dnl . dnl AC_PREREQ(2.59) -AC_INIT +m4_include([../bfd/version.m4]) +AC_INIT([gprof], BFD_VERSION) AC_CONFIG_SRCDIR([gprof.c]) AC_CANONICAL_TARGET([]) AC_ISC_POSIX -changequote(,)dnl -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` -changequote([,])dnl -AM_INIT_AUTOMAKE(gprof, ${BFD_VERSION}) +AM_INIT_AUTOMAKE dnl For simplicity, we use the BFD configuration file for most dnl things. However, we also need our own configuration file for diff --git a/ld/ChangeLog b/ld/ChangeLog index f7dd2124b0..4a07def918 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2014-07-04 Alan Modra + + * 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-03 Alan Modra PR 17068 diff --git a/ld/Makefile.am b/ld/Makefile.am index 2bb2cacf8e..8e8ae202c8 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -2069,11 +2069,10 @@ ld.1: $(srcdir)/ld.texinfo configdoc.texi MAINTAINERCLEANFILES = configdoc.texi ld.1 -# We want to reconfigure if configure.host or configure.tgt changes. We -# extract version from bfd/configure.in, so we must depend on that also. +# We want to reconfigure if configure.host or configure.tgt changes. +# development.sh is used to determine -Werror default. CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt \ - $(srcdir)/../bfd/configure.in \ - $(srcdir)/../bfd/development.sh + $(BFDDIR)/development.sh MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.@OBJEXT@ crtend.@OBJEXT@ ld.log ld.sum diff --git a/ld/Makefile.in b/ld/Makefile.in index dc4b61ea06..0a58737809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -82,7 +82,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/progtest.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 \ @@ -891,11 +892,10 @@ ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $ @ENABLE_PLUGINS_TRUE@libldtestplug_la_LDFLAGS = -no-undefined -rpath /nowhere MAINTAINERCLEANFILES = configdoc.texi ld.1 ld.info -# We want to reconfigure if configure.host or configure.tgt changes. We -# extract version from bfd/configure.in, so we must depend on that also. +# We want to reconfigure if configure.host or configure.tgt changes. +# development.sh is used to determine -Werror default. CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt \ - $(srcdir)/../bfd/configure.in \ - $(srcdir)/../bfd/development.sh + $(BFDDIR)/development.sh MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.@OBJEXT@ crtend.@OBJEXT@ ld.log ld.sum diff --git a/ld/configure b/ld/configure index 4942c2d71f..7a899be1ac 100755 --- a/ld/configure +++ b/ld/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 ld 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='ld' +PACKAGE_TARNAME='ld' +PACKAGE_VERSION='2.24.51' +PACKAGE_STRING='ld 2.24.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="ldmain.c" # Factoring default headers for most tests. @@ -846,7 +846,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}' @@ -1347,7 +1347,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 ld 2.24.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1395,7 +1395,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/ld] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1417,7 +1417,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of ld 2.24.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1539,7 +1541,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +ld configure 2.24.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2248,7 +2250,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 ld $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3557,7 +3559,6 @@ if test "$ac_res" != no; then : fi -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), @@ -4057,8 +4058,8 @@ fi # Define the identity of the package. - PACKAGE=ld - VERSION=${BFD_VERSION} + PACKAGE='ld' + VERSION='2.24.51' cat >>confdefs.h <<_ACEOF @@ -12196,7 +12197,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12199 "configure" +#line 12200 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12302,7 +12303,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12305 "configure" +#line 12306 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17548,7 +17549,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 ld $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17612,7 +17613,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +ld 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/ld/configure.in b/ld/configure.in index 1ac69a39f2..d1bf1e48dd 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -18,17 +18,15 @@ dnl . dnl AC_PREREQ(2.59) -AC_INIT +m4_include([../bfd/version.m4]) +AC_INIT([ld], BFD_VERSION) AC_CONFIG_SRCDIR(ldmain.c) AC_CANONICAL_TARGET AC_CANONICAL_BUILD AC_ISC_POSIX -changequote(,)dnl -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` -changequote([,])dnl -AM_INIT_AUTOMAKE(ld, ${BFD_VERSION}) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE AC_ARG_WITH(lib-path, [ --with-lib-path=dir1:dir2... set default LIB_PATH],LIB_PATH=$withval) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 800df07be8..0b206d5fc1 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,11 +1,20 @@ +2014-07-04 Alan Modra + + * 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 Senthil Kumar Selvaraj Pitchumani Sivanupandi Soundararajan * 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 diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 9ff6a38da4..4acc4363f3 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 f83f1d968e..6079002094 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 40a2b858db..b3c8931042 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 3ffcaa0ecd..b93e855a71 100644 --- a/opcodes/configure.in +++ b/opcodes/configure.in @@ -18,20 +18,14 @@ dnl . 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 -- 2.34.1