aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-06-28 18:59:51 +0000
committerTom Tromey <tromey@redhat.com>2013-06-28 18:59:51 +0000
commitd6c2da544627e23c87003859209152903dc7fcbc (patch)
treec1cd4490cf0324ad4a14333dfeb4fbef1507ed1d /sim
parent74da6f00a3ba65e1f2d359a59829d796d1ec3a8e (diff)
downloadgdb-d6c2da544627e23c87003859209152903dc7fcbc.zip
gdb-d6c2da544627e23c87003859209152903dc7fcbc.tar.gz
gdb-d6c2da544627e23c87003859209152903dc7fcbc.tar.bz2
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/ChangeLog6
-rw-r--r--sim/common/Make-common.in2
-rwxr-xr-xsim/common/create-version.sh2
-rw-r--r--sim/ppc/ChangeLog5
-rw-r--r--sim/ppc/Makefile.in2
5 files changed, 14 insertions, 3 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index cc0e9aa..19ee5c4 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 769f782..afa3894 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 aaf2ab3..7464277 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 2f7da02..8415cb4 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 1652b24..75bb9c3 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)