diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 10 | ||||
| -rw-r--r-- | bfd/Makefile.am | 8 | ||||
| -rw-r--r-- | bfd/Makefile.in | 10 | ||||
| -rw-r--r-- | bfd/configure.in | 3 | ||||
| -rw-r--r-- | bfd/doc/Makefile.in | 2 | ||||
| -rw-r--r-- | bfd/version.m4 | 1 |
6 files changed, 21 insertions, 13 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1218fc9..064d5ae 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2014-07-04 Alan Modra <amodra@gmail.com> + + * 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 <amodra@gmail.com> * elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Clear diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 595c489..72ee0bf 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 2ea8516..807cc98 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 2cc4499..017304f 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -18,7 +18,8 @@ dnl <http://www.gnu.org/licenses/>. 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 77e837c..944dee8 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 0000000..e032e68 --- /dev/null +++ b/bfd/version.m4 @@ -0,0 +1 @@ +m4_define([BFD_VERSION], [2.24.51]) |