diff options
author | Nathan Sidwell <nathan@codesourcery.com> | 2006-09-11 09:45:48 +0000 |
---|---|---|
committer | Nathan Sidwell <nathan@codesourcery.com> | 2006-09-11 09:45:48 +0000 |
commit | dacf0e67e7331ec70c5cce9824b325fc24c48d4b (patch) | |
tree | 40573d8136332bf198dcdaec1ab69f599c7526ae | |
parent | 38df302b16fba8ca76e6c664b8efe952b7e15909 (diff) | |
download | gdb-dacf0e67e7331ec70c5cce9824b325fc24c48d4b.tar.gz |
bfd/
* Makefile.am (VERSUFFIX_s): Remove.
(bfdver.h): Replace bfd_version_suffix with bfd_version_package.
* configure.in: Replace --with-versuffix with --with-pkgversion.
* version.h: Remove BFD_VERSION_SUFFIX. Update BFD_VERSION_STRING.
* Makefile.in: Rebuilt.
* configure: Rebuilt.
binutils/
* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
(REPORT_BUGS_TO): ... this.
(INCLUDES): Update.
* Makefile.in: Rebuilt.
gas/
* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
(REPORT_BUGS_TO): ... this.
(INCLUDES, DEP_INCLUDES): Update.
* Makefile.in: Rebuilt.
gprof/
* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
(REPORT_BUGS_TO): ... this.
(VERSUFFIX_s): Remove.
(INCLUDES): Update.
* configure.in: Replace --with-versuffix with --with-pkgversion.
* gprof.c (main): Update version printing.
* Makefile.in: Rebuilt.
* configure: Rebuilt.
ld/
* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
(REPORT_BUGS_TO): ... this.
(INCLUDES): Update.
* Makefile.in: Rebuilt.
-rw-r--r-- | ChangeLog.csl | 38 | ||||
-rw-r--r-- | bfd/Makefile.am | 6 | ||||
-rw-r--r-- | bfd/Makefile.in | 7 | ||||
-rwxr-xr-x | bfd/configure | 25 | ||||
-rw-r--r-- | bfd/configure.in | 19 | ||||
-rw-r--r-- | bfd/version.h | 3 |
6 files changed, 65 insertions, 33 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index c3c13d905a5..71b212f21d0 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,41 @@ +2006-09-10 Nathan Sidwell <nathan@codesourcery.com> + + bfd/ + * Makefile.am (VERSUFFIX_s): Remove. + (bfdver.h): Replace bfd_version_suffix with bfd_version_package. + * configure.in: Replace --with-versuffix with --with-pkgversion. + * version.h: Remove BFD_VERSION_SUFFIX. Update BFD_VERSION_STRING. + * Makefile.in: Rebuilt. + * configure: Rebuilt. + + binutils/ + * Makefile.am (REPORT_BUGS_TO_s): Replace with ... + (REPORT_BUGS_TO): ... this. + (INCLUDES): Update. + * Makefile.in: Rebuilt. + + gas/ + * Makefile.am (REPORT_BUGS_TO_s): Replace with ... + (REPORT_BUGS_TO): ... this. + (INCLUDES, DEP_INCLUDES): Update. + * Makefile.in: Rebuilt. + + gprof/ + * Makefile.am (REPORT_BUGS_TO_s): Replace with ... + (REPORT_BUGS_TO): ... this. + (VERSUFFIX_s): Remove. + (INCLUDES): Update. + * configure.in: Replace --with-versuffix with --with-pkgversion. + * gprof.c (main): Update version printing. + * Makefile.in: Rebuilt. + * configure: Rebuilt. + + ld/ + * Makefile.am (REPORT_BUGS_TO_s): Replace with ... + (REPORT_BUGS_TO): ... this. + (INCLUDES): Update. + * Makefile.in: Rebuilt. + 2006-09-08 Paul Brook <paul@codesourcery.com> gas/ diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 9fc84d069c6..712509e65b9 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -25,8 +25,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) -VERSUFFIX_s := "\"@VERSUFFIX@\"" - # bfd.h goes here, for now BFD_H = bfd.h @@ -937,12 +935,12 @@ bfdver.h: $(srcdir)/version.h $(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_version_suffix=$(VERSUFFIX_s) ;\ + 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}\"" ;\ fi ;\ - sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_suffix@/$$bfd_version_suffix/" < $(srcdir)/version.h > $@ + 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 > $@ # What appears below is generated by a hacked mkdep using gcc -MM. diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 5bbf294be9f..7d32b76fc4a 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -186,7 +186,7 @@ TDEFINES = @TDEFINES@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ -VERSUFFIX = @VERSUFFIX@ +PKGVERSION = @PKGVERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WIN32LDFLAGS = @WIN32LDFLAGS@ WIN32LIBADD = @WIN32LIBADD@ @@ -262,7 +262,6 @@ SUBDIRS = doc po bfddocdir = doc bfdlib_LTLIBRARIES = libbfd.la AM_CFLAGS = $(WARN_CFLAGS) -VERSUFFIX_s := "\"@VERSUFFIX@\"" # bfd.h goes here, for now BFD_H = bfd.h @@ -1503,12 +1502,12 @@ bfdver.h: $(srcdir)/version.h $(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_version_suffix=$(VERSUFFIX_s) ;\ + 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}\"" ;\ fi ;\ - sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_suffix@/$$bfd_version_suffix/" < $(srcdir)/version.h > $@ + 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 > $@ # What appears below is generated by a hacked mkdep using gcc -MM. diff --git a/bfd/configure b/bfd/configure index 203ecfa941e..6e8d29c1fb5 100755 --- a/bfd/configure +++ b/bfd/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 AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL VERSUFFIX WARN_CFLAGS NO_WERROR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_LIBBFD_TRUE INSTALL_LIBBFD_FALSE host_noncanonical target_noncanonical bfdlibdir bfdincludedir CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l HDEFINES BFD_HOST_64BIT_LONG BFD_HOST_LONG_LONG BFD_HOST_64_BIT_DEFINED BFD_HOST_64_BIT BFD_HOST_U_64_BIT CC_FOR_BUILD EXEEXT_FOR_BUILD COREFILE COREFLAG WIN32LDFLAGS WIN32LIBADD TDEFINES wordsize bfd_libs all_backends bfd_backends bfd_machines bfd_default_target_size bfd_file_ptr bfd_ufile_ptr tdefaults 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 AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL PKGVERSION WARN_CFLAGS NO_WERROR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_LIBBFD_TRUE INSTALL_LIBBFD_FALSE host_noncanonical target_noncanonical bfdlibdir bfdincludedir CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l HDEFINES BFD_HOST_64BIT_LONG BFD_HOST_LONG_LONG BFD_HOST_64_BIT_DEFINED BFD_HOST_64_BIT BFD_HOST_U_64_BIT CC_FOR_BUILD EXEEXT_FOR_BUILD COREFILE COREFLAG WIN32LDFLAGS WIN32LIBADD TDEFINES wordsize bfd_libs all_backends bfd_backends bfd_machines bfd_default_target_size bfd_file_ptr bfd_ufile_ptr tdefaults datarootdir docdir htmldir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -873,7 +873,7 @@ Optional Packages: --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-mmap try using mmap for BFD input files if available - --with-versuffix=SFX Append SFX to the version string + --with-pkgversion=PKG Add PKG to the version string --with-included-gettext use the GNU gettext library included here Some influential environment variables: @@ -4387,21 +4387,20 @@ _ACEOF fi -# The trailing component of the string reported as the version number -# by gdb. For an official FSF release, it is empty. +# Package version. For an official FSF release, it is empty. -# Check whether --with-versuffix or --without-versuffix was given. -if test "${with_versuffix+set}" = set; then - withval="$with_versuffix" +# 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: version suffix not specified" >&5 -echo "$as_me: error: version suffix not specified" >&2;} + 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) VERSUFFIX=" (CodeSourcery Unofficial)" ;; - *) VERSUFFIX=" ($withval)" ;; + no) PKGVERSION= ;; + *) PKGVERSION="($withval) " ;; esac else - VERSUFFIX= + PKGVERSION= fi; @@ -15263,7 +15262,7 @@ s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@LN_S@,$LN_S,;t t s,@LIBTOOL@,$LIBTOOL,;t t -s,@VERSUFFIX@,$VERSUFFIX,;t t +s,@PKGVERSION@,$PKGVERSION,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t s,@NO_WERROR@,$NO_WERROR,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t diff --git a/bfd/configure.in b/bfd/configure.in index f110727b416..dd2cb7309f6 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -63,19 +63,18 @@ if test $use_secureplt = true; then [Define if we should default to creating read-only plt entries]) fi -# The trailing component of the string reported as the version number -# by gdb. For an official FSF release, it is empty. -AC_ARG_WITH(versuffix, - AS_HELP_STRING([--with-versuffix=SFX], - [Append SFX to the version string]), +# 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([version suffix not specified]) ;; - no) VERSUFFIX=" (CodeSourcery Unofficial)" ;; - *) VERSUFFIX=" ($withval)" ;; + yes) AC_MSG_ERROR([package version not specified]) ;; + no) PKGVERSION= ;; + *) PKGVERSION="($withval) " ;; esac], - VERSUFFIX= + PKGVERSION= ) -AC_SUBST(VERSUFFIX) +AC_SUBST(PKGVERSION) AM_BINUTILS_WARNINGS diff --git a/bfd/version.h b/bfd/version.h index 004c17cc86e..3465594426f 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,3 @@ #define BFD_VERSION_DATE 20060623 #define BFD_VERSION @bfd_version@ -#define BFD_VERSION_SUFFIX @bfd_version_suffix@ -#define BFD_VERSION_STRING @bfd_version_string@ BFD_VERSION_SUFFIX +#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ |