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.
2007-03-01 15:48:36 +00:00 · 2007-03-01 15:48:36 +00:00 · 066c2a57f5
commit 066c2a57f5
parent 563d09a555
17 changed files with 105 additions and 110 deletions
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@ -1,3 +1,11 @@
+2007-03-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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  <nathan@codesourcery.com>

 	* config.bfd (sh-*-uclinux, sh[12]-*-uclinux): New stanza.
--- 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 > $@

--- 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 > $@

--- 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;

--- 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)

--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@ -1,3 +1,7 @@
+2007-03-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* version.c: Update copyright date.
+
 2007-03-01  Daniel Jacobowitz  <dan@codesourcery.com>

 	* Makefile.am (install-exec-local): Depend on $(noinst_PROGRAMS).
--- 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.

--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@ -1,3 +1,7 @@
+2007-03-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* as.c (parse_args): Update copyright date.
+
 2007-02-28  Nathan Sidwell  <nathan@codesourcery.com>

 	* configure.tgt (sh-*-uclinux, sh[12]-*-uclinux): Specify as elf.
--- 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"));
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@ -1,3 +1,15 @@
+2007-03-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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  <mark@codesourcery.com>
            Nathan Sidwell  <nathan@codesourcery.com>
            Vladimir Prus  <vladimir@codesourcery.com
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@ -16,12 +16,10 @@ AM_CFLAGS = $(WARN_CFLAGS)

 MKDEP = gcc -MM

-PKGVERSION = "\"@PKGVERSION@\""
 REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""

 INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
 	-I$(srcdir)/../bfd @INCINTL@ -I. \
-	-DPKGVERSION=$(PKGVERSION) \
 	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""

@ -198,116 +196,115 @@ basic_blocks.o: basic_blocks.c $(INCDIR)/libiberty.h \
  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h basic_blocks.h corefile.h gmon_io.h gmon_out.h \
+  gconfig.h basic_blocks.h corefile.h gmon_io.h gmon_out.h \
  search_list.h source.h symtab.h sym_ids.h
 call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
  $(INCDIR)/ansidecl.h ../bfd/config.h $(INCDIR)/fopen-same.h \
  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h ./gconfig.h search_list.h source.h \
+  $(INCDIR)/symcat.h gconfig.h search_list.h source.h \
  symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \
  gmon_out.h sym_ids.h
 cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h call_graph.h cg_arcs.h \
-  cg_dfn.h cg_print.h utils.h sym_ids.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
+  utils.h sym_ids.h
 cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h cg_arcs.h cg_dfn.h \
-  utils.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h cg_arcs.h cg_dfn.h utils.h
 cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h cg_arcs.h cg_print.h \
-  hist.h utils.h corefile.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h cg_arcs.h cg_print.h hist.h utils.h \
+  corefile.h
 corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h corefile.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h corefile.h
 gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  basic_blocks.h corefile.h call_graph.h gmon_io.h gmon_out.h \
  gmon.h hertz.h hist.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h
 gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h ../bfd/bfdver.h \
  search_list.h source.h symtab.h basic_blocks.h call_graph.h \
  cg_arcs.h cg_print.h corefile.h gmon_io.h hertz.h hist.h \
  sym_ids.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h
 hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h hertz.h
+  gconfig.h hertz.h
 hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h corefile.h gmon_io.h \
-  gmon_out.h hist.h sym_ids.h utils.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h corefile.h gmon_io.h gmon_out.h hist.h \
+  sym_ids.h utils.h
 source.o: source.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
+  gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  $(INCDIR)/filenames.h search_list.h source.h
 search_list.o: search_list.c $(INCDIR)/libiberty.h \
  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h
+  gconfig.h search_list.h
 symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h
 sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  $(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  sym_ids.h
 utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  utils.h
 i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
 bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@ -175,7 +175,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGVERSION = "\"@PKGVERSION@\""
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
@ -241,7 +240,6 @@ AM_CFLAGS = $(WARN_CFLAGS)
 MKDEP = gcc -MM
 INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
 	-I$(srcdir)/../bfd @INCINTL@ -I. \
-	-DPKGVERSION=$(PKGVERSION) \
 	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""

@ -935,116 +933,115 @@ basic_blocks.o: basic_blocks.c $(INCDIR)/libiberty.h \
  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h basic_blocks.h corefile.h gmon_io.h gmon_out.h \
+  gconfig.h basic_blocks.h corefile.h gmon_io.h gmon_out.h \
  search_list.h source.h symtab.h sym_ids.h
 call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
  $(INCDIR)/ansidecl.h ../bfd/config.h $(INCDIR)/fopen-same.h \
  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h ./gconfig.h search_list.h source.h \
+  $(INCDIR)/symcat.h gconfig.h search_list.h source.h \
  symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \
  gmon_out.h sym_ids.h
 cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h call_graph.h cg_arcs.h \
-  cg_dfn.h cg_print.h utils.h sym_ids.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
+  utils.h sym_ids.h
 cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h cg_arcs.h cg_dfn.h \
-  utils.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h cg_arcs.h cg_dfn.h utils.h
 cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h cg_arcs.h cg_print.h \
-  hist.h utils.h corefile.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h cg_arcs.h cg_print.h hist.h utils.h \
+  corefile.h
 corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h corefile.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h corefile.h
 gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  basic_blocks.h corefile.h call_graph.h gmon_io.h gmon_out.h \
  gmon.h hertz.h hist.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h
 gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h ../bfd/bfdver.h \
  search_list.h source.h symtab.h basic_blocks.h call_graph.h \
  cg_arcs.h cg_print.h corefile.h gmon_io.h hertz.h hist.h \
  sym_ids.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h
 hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h hertz.h
+  gconfig.h hertz.h
 hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
-  search_list.h source.h symtab.h corefile.h gmon_io.h \
-  gmon_out.h hist.h sym_ids.h utils.h
+  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+  source.h symtab.h corefile.h gmon_io.h gmon_out.h hist.h \
+  sym_ids.h utils.h
 source.o: source.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
+  gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  $(INCDIR)/filenames.h search_list.h source.h
 search_list.o: search_list.c $(INCDIR)/libiberty.h \
  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h
+  gconfig.h search_list.h
 symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h
 sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
  $(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  sym_ids.h
 utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  utils.h
 i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
  corefile.h hist.h
 flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
 bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
--- a/gprof/configure
+++ b/gprof/configure
@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL PKGVERSION REPORT_BUGS_TO USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT MKINSTALLDIRS MSGFMT MSGMERGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GENINSRC_NEVER_TRUE GENINSRC_NEVER_FALSE CPP EGREP WARN_CFLAGS NO_WERROR datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL REPORT_BUGS_TO USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT MKINSTALLDIRS MSGFMT MSGMERGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GENINSRC_NEVER_TRUE GENINSRC_NEVER_FALSE CPP EGREP WARN_CFLAGS NO_WERROR datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
 ac_subst_files=''

 # Initialize some variables set by options.
@ -867,7 +867,6 @@ Optional Packages:
  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
  --with-gnu-ld           assume the C compiler uses GNU ld default=no
  --with-pic              try to use only PIC/non-PIC objects default=use both
-  --with-pkgversion=PKG   Add PKG to the version string
  --with-bugurl=URL       Direct users to URL to report a bug

 Some influential environment variables:
@ -3867,7 +3866,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 3870 "configure"' > 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
--- 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],
--- 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"));
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@ -1,3 +1,8 @@
+2007-03-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* ldver.c (ldversion): Remove word "version" from output.  Update
+	copyright date.
+
 2007-02-28  Nathan Sidwell  <nathan@codesourcery.com>

 	* Makefile.am (ALL_EMULATIONS): Add eshelf_uclinux.o
--- 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"));