diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-01-06 11:58:20 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-01-06 12:11:42 -0800 |
| commit | 03f06e00db6e32f3eead1d7e68aacfed0354a618 (patch) | |
| tree | 81bdfe023b264df613a144f88cce79ed66650228 | |
| parent | 5180cbb8e3718666973e4397e311e33f04240df2 (diff) | |
| download | binutils-gdb-users/hjl/version.tar.gz | |
Remove BFD_VERSION_DATEusers/hjl/version
| -rw-r--r-- | bfd/Makefile.am | 12 | ||||
| -rw-r--r-- | bfd/Makefile.in | 12 | ||||
| -rw-r--r-- | bfd/version.h | 1 |
3 files changed, 14 insertions, 11 deletions
diff --git a/bfd/Makefile.am b/bfd/Makefile.am index e1ed19ac256..123180d0a73 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -1037,9 +1037,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ . $(srcdir)/development.sh ;\ if test "$$development" = true ; then \ - if test -e $(srcdir)/../.git; then \ - here=`pwd`; \ - cd $(srcdir); \ + here=`pwd`; \ + cd $(srcdir)/..; \ + if test -e .git; then \ bfd_version_date=`git log -1 --pretty=%ci | awk '{ print $$1 }' | sed -e "s/-//g"` ;\ bfd_remote_git_repo=`git remote -v | grep fetch | awk '{ print $$2 }'` ;\ case $$bfd_remote_git_repo in \ @@ -1049,11 +1049,13 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in bfd_git_commit=`git log -1 --pretty=%H` ;\ bfd_git_branch=`git name-rev --name-only $$bfd_git_commit` ;\ bfd_version_string="\"$(VERSION).$${bfd_version_date}\\\n commit $$bfd_git_commit\\\n from $$bfd_remote_git_repo on $$bfd_git_branch\"" ;\ - cd $$here; \ else \ - bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ + ChangeLog=`find . -name ChangeLog`; \ + bfd_version_date=`for cl in $$ChangeLog; do head -1 $$cl; done \ + | awk '{ print $$1 }' | sed -e "s/-//g" | sort -n | tail -1`; \ bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ fi ;\ + cd $$here; \ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ sed -e "s,@bfd_version@,$$bfd_version," \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 6c7b36d9209..10814b35796 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -2099,9 +2099,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ . $(srcdir)/development.sh ;\ if test "$$development" = true ; then \ - if test -e $(srcdir)/../.git; then \ - here=`pwd`; \ - cd $(srcdir); \ + here=`pwd`; \ + cd $(srcdir)/..; \ + if test -e .git; then \ bfd_version_date=`git log -1 --pretty=%ci | awk '{ print $$1 }' | sed -e "s/-//g"` ;\ bfd_remote_git_repo=`git remote -v | grep fetch | awk '{ print $$2 }'` ;\ case $$bfd_remote_git_repo in \ @@ -2111,11 +2111,13 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in bfd_git_commit=`git log -1 --pretty=%H` ;\ bfd_git_branch=`git name-rev --name-only $$bfd_git_commit` ;\ bfd_version_string="\"$(VERSION).$${bfd_version_date}\\\n commit $$bfd_git_commit\\\n from $$bfd_remote_git_repo on $$bfd_git_branch\"" ;\ - cd $$here; \ else \ - bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ + ChangeLog=`find . -name ChangeLog`; \ + bfd_version_date=`for cl in $$ChangeLog; do head -1 $$cl; done \ + | awk '{ print $$1 }' | sed -e "s/-//g" | sort -n | tail -1`; \ bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ fi ;\ + cd $$here; \ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ sed -e "s,@bfd_version@,$$bfd_version," \ diff --git a/bfd/version.h b/bfd/version.h index 55baba15274..e816dbb92c4 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,3 @@ -#define BFD_VERSION_DATE 20150106 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ #define REPORT_BUGS_TO @report_bugs_to@ |