From ee5c21a00edd649f4305fbfc3722746f83055ce2 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Wed, 18 Apr 2007 12:14:50 +0000 Subject: [PATCH] 2007-04-18 Matthias Klose * Makefile.am (libbfd_la_LDFLAGS): Use bfd soversion. (bfdver.h): Use the date in non-release builds for the soversion. * Makefile.in: Regenerate. 2007-04-18 Matthias Klose * Makefile.am (libopcodes_la_LDFLAGS): Use bfd soversion. * Makefile.in: Regenerate. --- bfd/ChangeLog | 6 ++++++ bfd/Makefile.am | 9 ++++++--- bfd/Makefile.in | 9 ++++++--- opcodes/ChangeLog | 5 +++++ opcodes/Makefile.am | 2 +- opcodes/Makefile.in | 2 +- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b670e62c81..f4b9a05ca1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2007-04-18 Matthias Klose + + * Makefile.am (libbfd_la_LDFLAGS): Use bfd soversion. + (bfdver.h): Use the date in non-release builds for the soversion. + * Makefile.in: Regenerate. + 2007-04-17 Paul Brook * elf.c (_bfd_elf_is_function_type): New function. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index e85d75cf1a..e0e3f96b6e 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -746,7 +746,7 @@ ofiles: stamp-ofiles ; @true libbfd_la_SOURCES = $(BFD32_LIBS_CFILES) libbfd_la_DEPENDENCIES = $(OFILES) ofiles libbfd_la_LIBADD = `cat ofiles` @WIN32LIBADD@ -libbfd_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ +libbfd_la_LDFLAGS = -release `cat libtool-soversion` @WIN32LDFLAGS@ # libtool will build .libs/libbfd.a. We create libbfd.a in the build # directory so that we don't have to convert all the programs that use @@ -962,23 +962,26 @@ MOSTLYCLEANFILES = ofiles stamp-ofiles CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ stmp-bin2-h stmp-lbfd-h stmp-lcoff-h -DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) +DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion 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_soversion="$(VERSION)" ;\ bfd_version_package="\"$(PKGVERSION)\"" ;\ report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ 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_soversion="$(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," \ -e "s,@report_bugs_to@,$$report_bugs_to," \ - < $(srcdir)/version.h > $@ + < $(srcdir)/version.h > $@; \ + echo "$${bfd_soversion}" > libtool-soversion # What appears below is generated by a hacked mkdep using gcc -MM. diff --git a/bfd/Makefile.in b/bfd/Makefile.in index d29ae5c4b7..40acf2db2e 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -924,7 +924,7 @@ OFILES = $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@ @bfd64_libs@ libbfd_la_SOURCES = $(BFD32_LIBS_CFILES) libbfd_la_DEPENDENCIES = $(OFILES) ofiles libbfd_la_LIBADD = `cat ofiles` @WIN32LIBADD@ -libbfd_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ +libbfd_la_LDFLAGS = -release `cat libtool-soversion` @WIN32LDFLAGS@ # libtool will build .libs/libbfd.a. We create libbfd.a in the build # directory so that we don't have to convert all the programs that use @@ -947,7 +947,7 @@ MOSTLYCLEANFILES = ofiles stamp-ofiles CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ stmp-bin2-h stmp-lbfd-h stmp-lcoff-h -DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) +DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1534,17 +1534,20 @@ 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_soversion="$(VERSION)" ;\ bfd_version_package="\"$(PKGVERSION)\"" ;\ report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ 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_soversion="$(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," \ -e "s,@report_bugs_to@,$$report_bugs_to," \ - < $(srcdir)/version.h > $@ + < $(srcdir)/version.h > $@; \ + echo "$${bfd_soversion}" > libtool-soversion # What appears below is generated by a hacked mkdep using gcc -MM. diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index d846b72d6b..e7acaca159 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2007-04-18 Matthias Klose + + * Makefile.am (libopcodes_la_LDFLAGS): Use bfd soversion. + * Makefile.in: Regenerate. + 2007-04-14 Steve Ellcey * Makefile.am: Add ACLOCAL_AMFLAGS. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 96433f3fae..d187ce2105 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -362,7 +362,7 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # if host != build. libopcodes_la_DEPENDENCIES = $(OFILES) libopcodes_la_LIBADD = $(OFILES) @WIN32LIBADD@ -libopcodes_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ +libopcodes_la_LDFLAGS = -release `cat ../bfd/libtool-soversion` @WIN32LDFLAGS@ # libtool will build .libs/libopcodes.a. We create libopcodes.a in # the build directory so that we don't have to convert all the diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 8acad92bd6..dbb4354bc4 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -571,7 +571,7 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # if host != build. libopcodes_la_DEPENDENCIES = $(OFILES) libopcodes_la_LIBADD = $(OFILES) @WIN32LIBADD@ -libopcodes_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ +libopcodes_la_LDFLAGS = -release `cat ../bfd/libtool-soversion` @WIN32LDFLAGS@ # libtool will build .libs/libopcodes.a. We create libopcodes.a in # the build directory so that we don't have to convert all the -- 2.34.1