From 066c2a57f5858310c9f12518317aecd4b54e753d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 1 Mar 2007 15:48:36 +0000 Subject: 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. --- gprof/ChangeLog | 12 +++++++++++ gprof/Makefile.am | 61 ++++++++++++++++++++++++++---------------------------- gprof/Makefile.in | 61 ++++++++++++++++++++++++++---------------------------- gprof/configure | 24 ++------------------- gprof/configure.in | 13 ------------ gprof/gprof.c | 3 ++- 6 files changed, 74 insertions(+), 100 deletions(-) (limited to 'gprof') diff --git a/gprof/ChangeLog b/gprof/ChangeLog index b36a613..1c80201 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 9cfe317..13d592d 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 d956ad5..98406e6 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")); -- cgit v1.1