diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-06-28 18:59:49 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-06-28 18:59:49 +0000 |
| commit | 20e7d3de3949b5f590040708f2991cb9ddb9e17c (patch) | |
| tree | 90a4427e758d68c08cc3d6a4822a97fc51a049b5 /sim | |
| parent | 50c506def5189908296f994ccab6f6dea5844f60 (diff) | |
| download | gdb-20e7d3de3949b5f590040708f2991cb9ddb9e17c.tar.gz | |
move version.in from gdb/common back to gdb
This reverts part of the earlier version.in change. It moves
version.in back to the gdb directory. This works around the CVS bug
we've found.
gdb
* Makefile.in (version.c): Use version.in, not
common/version.in.
* common/create-version.sh: Likewise.
* common/version.in: Move...
* version.in: ...here.
gdb/doc
* Makefile.in (version.subst): Use version.in, not
common/version.in.
* gdbint.texinfo (Versions and Branches, Releasing GDB):
Likewise.
gdb/gdbserver
* Makefile.in (version.c): Use version.in, not
common/version.in.
sim/common
* Make-common.in (version.c): Use version.in, not
common/version.in.
* create-version.sh: Likewise.
sim/ppc:
* Make-common.in (version.c): Use version.in, not
common/version.in.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/common/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 2 | ||||
| -rwxr-xr-x | sim/common/create-version.sh | 2 | ||||
| -rw-r--r-- | sim/ppc/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/ppc/Makefile.in | 2 |
5 files changed, 14 insertions, 3 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index cc0e9aa3556..19ee5c470c1 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2013-06-28 Tom Tromey <tromey@redhat.com> + + * Make-common.in (version.c): Use version.in, not + common/version.in. + * create-version.sh: Likewise. + 2013-06-24 Joel Brobecker <brobecker@adacore.com> * create-version.sh: New script. Adapted from diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 769f782df47..afa3894aa38 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -300,7 +300,7 @@ stamp-tvals: gentmap $(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c touch stamp-tvals -version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/common/version.in +version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/version.in $(SHELL) $(srccom)/create-version.sh $(srccom) version.c # diff --git a/sim/common/create-version.sh b/sim/common/create-version.sh index aaf2ab359fa..746427738a2 100755 --- a/sim/common/create-version.sh +++ b/sim/common/create-version.sh @@ -26,7 +26,7 @@ output="$2" rm -f version.c-tmp $output version.tmp date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$/\1/p' $srcdir/../../bfd/version.h` -sed -e "s/DATE/$date/" < $srcdir/../../gdb/common/version.in > version.tmp +sed -e "s/DATE/$date/" < $srcdir/../../gdb/version.in > version.tmp echo '#include "version.h"' >> version.c-tmp echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp mv version.c-tmp $output diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 2f7da02972d..8415cb43e70 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,8 @@ +2013-06-28 Tom Tromey <tromey@redhat.com> + + * Make-common.in (version.c): Use version.in, not + common/version.in. + 2013-06-24 Joel Brobecker <brobecker@adacore.com> * Makefile.in (srccom): New variable. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 1652b248160..75bb9c3e63c 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -563,7 +563,7 @@ $(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk tmp-defines $(LIB_OBJ) $(GDB_OBJ) $(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ) $(RANLIB) $(TARGETLIB) -version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/common/version.in +version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/version.in $(SHELL) $(srccom)/create-version.sh $(srccom) version.c version.o: version.c $(version_h) |