From 066c2a57f5858310c9f12518317aecd4b54e753d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 1 Mar 2007 15:48:36 +0000 Subject: [PATCH] bfd: * Makefile.am (bfdver.h): Use "." not " " between version number and date. * Makefile.in: Regenerate. * configure.in (PKGVERSION): Default to "(GNU Binutils) ". * configure: Regenerate. binutils: * version.c (print_version): Update copyright date. gas: * as.c (parse_args): Update copyright date. gprof: * gprof.c: Include bfdver.h (main): Use BFD_VERSION_STRING for version number and package name. * Makefile.am (PKGVERSION): Remove. (INCLUDES): Update. Regenerate dependencies. * Makefile.in: Regenerate. * configure.in (PKGVERSION): Remove. * configure: Regenerate. ld: * ldver.c (ldversion): Remove word "version" from output. Update copyright date. --- bfd/ChangeLog | 8 ++++++ bfd/Makefile.am | 2 +- bfd/Makefile.in | 2 +- bfd/configure | 2 +- bfd/configure.in | 2 +- binutils/ChangeLog | 4 +++ binutils/version.c | 4 +-- gas/ChangeLog | 4 +++ gas/as.c | 2 +- gprof/ChangeLog | 12 +++++++++ gprof/Makefile.am | 61 ++++++++++++++++++++++------------------------ gprof/Makefile.in | 61 ++++++++++++++++++++++------------------------ gprof/configure | 24 ++---------------- gprof/configure.in | 13 ---------- gprof/gprof.c | 3 ++- ld/ChangeLog | 5 ++++ ld/ldver.c | 6 ++--- 17 files changed, 105 insertions(+), 110 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d02f19a5089..a59681dc358 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2007-03-01 Joseph Myers + + * Makefile.am (bfdver.h): Use "." not " " between version number + and date. + * Makefile.in: Regenerate. + * configure.in (PKGVERSION): Default to "(GNU Binutils) ". + * configure: Regenerate. + 2007-02-28 Nathan Sidwell * config.bfd (sh-*-uclinux, sh[12]-*-uclinux): New stanza. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 6644b7cc14f..b474e8ddd03 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -968,7 +968,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in bfd_version_package="\"$(PKGVERSION)\"" ;\ if test "x$(RELEASE)" = x ; then \ bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ - bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\ + bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ fi ;\ sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 1537c82d9e1..5ec2b599865 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -1532,7 +1532,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in bfd_version_package="\"$(PKGVERSION)\"" ;\ if test "x$(RELEASE)" = x ; then \ bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ - bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\ + bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ fi ;\ sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@ diff --git a/bfd/configure b/bfd/configure index 460523db23b..00f656925ad 100755 --- a/bfd/configure +++ b/bfd/configure @@ -4399,7 +4399,7 @@ echo "$as_me: error: package version not specified" >&2;} *) PKGVERSION="($withval) " ;; esac else - PKGVERSION= + PKGVERSION="(GNU Binutils) " fi; diff --git a/bfd/configure.in b/bfd/configure.in index 0755226c255..9251e6494bc 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -72,7 +72,7 @@ AC_ARG_WITH(pkgversion, no) PKGVERSION= ;; *) PKGVERSION="($withval) " ;; esac], - PKGVERSION= + PKGVERSION="(GNU Binutils) " ) AC_SUBST(PKGVERSION) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index bf74c40388b..acea53ae69d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2007-03-01 Joseph Myers + + * version.c: Update copyright date. + 2007-03-01 Daniel Jacobowitz * Makefile.am (install-exec-local): Depend on $(noinst_PROGRAMS). diff --git a/binutils/version.c b/binutils/version.c index 9831416e366..e5d204bc484 100644 --- a/binutils/version.c +++ b/binutils/version.c @@ -1,6 +1,6 @@ /* version.c -- binutils version information - Copyright 1991, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright 1991, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2007 Free Software Foundation, Inc. This file is part of GNU Binutils. diff --git a/gas/ChangeLog b/gas/ChangeLog index d7151074624..e918fc86b3f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2007-03-01 Joseph Myers + + * as.c (parse_args): Update copyright date. + 2007-02-28 Nathan Sidwell * configure.tgt (sh-*-uclinux, sh[12]-*-uclinux): Specify as elf. diff --git a/gas/as.c b/gas/as.c index a4ff1528cc2..fcb47fa45fe 100644 --- a/gas/as.c +++ b/gas/as.c @@ -590,7 +590,7 @@ parse_args (int * pargc, char *** pargv) case OPTION_VERSION: /* This output is intended to follow the GNU standards document. */ printf (_("GNU assembler %s\n"), BFD_VERSION_STRING); - printf (_("Copyright 2005 Free Software Foundation, Inc.\n")); + printf (_("Copyright 2007 Free Software Foundation, Inc.\n")); printf (_("\ This program is free software; you may redistribute it under the terms of\n\ the GNU General Public License. This program has absolutely no warranty.\n")); diff --git a/gprof/ChangeLog b/gprof/ChangeLog index b36a6133aa6..1c802014913 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,15 @@ +2007-03-01 Joseph Myers + + * gprof.c: Include bfdver.h + (main): Use BFD_VERSION_STRING for version number and package + name. + * Makefile.am (PKGVERSION): Remove. + (INCLUDES): Update. + Regenerate dependencies. + * Makefile.in: Regenerate. + * configure.in (PKGVERSION): Remove. + * configure: Regenerate. + 2007-02-17 Mark Mitchell Nathan Sidwell Vladimir Prus conftest.$ac_ext + echo '#line 3869 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4154,24 +4153,6 @@ exec 5>>./config.log -# Package version. For an official FSF release, it is empty. - -# Check whether --with-pkgversion or --without-pkgversion was given. -if test "${with_pkgversion+set}" = set; then - withval="$with_pkgversion" - case "$withval" in - yes) { { echo "$as_me:$LINENO: error: package version not specified" >&5 -echo "$as_me: error: package version not specified" >&2;} - { (exit 1); exit 1; }; } ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION= - -fi; - - # The location to which bugs should be reported. # Check whether --with-bugurl or --without-bugurl was given. @@ -6997,7 +6978,6 @@ s,@LN_S@,$LN_S,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@LIBTOOL@,$LIBTOOL,;t t -s,@PKGVERSION@,$PKGVERSION,;t t s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t s,@USE_NLS@,$USE_NLS,;t t s,@LIBINTL@,$LIBINTL,;t t diff --git a/gprof/configure.in b/gprof/configure.in index 9cfe317f713..13d592d7a85 100644 --- a/gprof/configure.in +++ b/gprof/configure.in @@ -13,19 +13,6 @@ AM_INIT_AUTOMAKE(gprof, ${BFD_VERSION}) AM_PROG_LIBTOOL -# Package version. For an official FSF release, it is empty. -AC_ARG_WITH(pkgversion, - AS_HELP_STRING([--with-pkgversion=PKG], - [Add PKG to the version string]), - [case "$withval" in - yes) AC_MSG_ERROR([package version not specified]) ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac], - PKGVERSION= -) -AC_SUBST(PKGVERSION) - # The location to which bugs should be reported. AC_ARG_WITH(bugurl, AS_HELP_STRING([--with-bugurl=URL], diff --git a/gprof/gprof.c b/gprof/gprof.c index d956ad574d8..98406e67d3c 100644 --- a/gprof/gprof.c +++ b/gprof/gprof.c @@ -29,6 +29,7 @@ #include "libiberty.h" #include "gprof.h" +#include "bfdver.h" #include "search_list.h" #include "source.h" #include "symtab.h" @@ -411,7 +412,7 @@ main (int argc, char **argv) break; case 'v': /* This output is intended to follow the GNU standards document. */ - printf (_("GNU gprof %s\n"), PKGVERSION VERSION); + printf (_("GNU gprof %s\n"), BFD_VERSION_STRING); printf (_("Based on BSD gprof, copyright 1983 Regents of the University of California.\n")); printf (_("\ This program is free software. This program has absolutely no warranty.\n")); diff --git a/ld/ChangeLog b/ld/ChangeLog index 4ed6dc858fb..baeed175328 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2007-03-01 Joseph Myers + + * ldver.c (ldversion): Remove word "version" from output. Update + copyright date. + 2007-02-28 Nathan Sidwell * Makefile.am (ALL_EMULATIONS): Add eshelf_uclinux.o diff --git a/ld/ldver.c b/ld/ldver.c index 48b914357ef..873b59a32eb 100644 --- a/ld/ldver.c +++ b/ld/ldver.c @@ -1,6 +1,6 @@ /* ldver.c -- Print linker version. Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, - 2003 Free Software Foundation, Inc. + 2003, 2007 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -35,11 +35,11 @@ void ldversion (int noisy) { /* Output for noisy == 2 is intended to follow the GNU standards. */ - fprintf (stdout, _("GNU ld version %s\n"), BFD_VERSION_STRING); + fprintf (stdout, _("GNU ld %s\n"), BFD_VERSION_STRING); if (noisy & 2) { - printf (_("Copyright 2005 Free Software Foundation, Inc.\n")); + printf (_("Copyright 2007 Free Software Foundation, Inc.\n")); printf (_("\ This program is free software; you may redistribute it under the terms of\n\ the GNU General Public License. This program has absolutely no warranty.\n")); -- 2.30.2