* Makefile.in (cp-names-main.tab.o): Rename to test-cp-names.tab.o.

	* config/djgpp/config.sed: Handle new *cp-names.tab.* references.

diff --git a/gdb/ChangeLog.cplus b/gdb/ChangeLog.cplus
index 9061b16032e24c8becbb99810e5144c728c071ea..3909b1d96bf6c1601e49c76872edd0f148029669 100644 (file)
--- a/gdb/ChangeLog.cplus
+++ b/gdb/ChangeLog.cplus
@@ -1,3 +1,8 @@
+2004-02-29  Daniel Jacobowitz  <drow@mvista.com>
+
+       * Makefile.in (cp-names-main.tab.o): Rename to test-cp-names.tab.o.
+       * config/djgpp/config.sed: Handle new *cp-names.tab.* references.
+
 2004-02-09  Daniel Jacobowitz  <drow@mvista.com>
 
        * config/djgpp/fnchange.lst: Add cp-names.tab.c.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index acaf7f5e9a91e21e0e534ca8e30939f59e3fd00c..32ec9964db606c2bde9d4fb1ab836413adbfc700 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1462,11 +1462,11 @@ c-exp.tab.c: c-exp.y
 
 cp-names.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h)
 
-cp-names-main.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h)
+test-cp-names.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h)
        $(CC) -c $(INTERNAL_CFLAGS) -DTEST_CPNAMES \
-               -o cp-names-main.tab.o cp-names.tab.c
-test-cpnames: cp-names-main.tab.o $(LIBIBERTY)
-       $(CC) -o test-cpnames cp-names-main.tab.o $(LIBIBERTY)
+               -o test-cp-names.tab.o cp-names.tab.c
+test-cpnames: test-cp-names.tab.o $(LIBIBERTY)
+       $(CC) -o test-cpnames test-cp-names.tab.o $(LIBIBERTY)
 
 .PRECIOUS: cp-names.tab.c
 cp-names.tab.c: cp-names.y

diff --git a/gdb/config/djgpp/config.sed b/gdb/config/djgpp/config.sed
index 4313bfb0c0c0ef4346a4ab924dcaae519458642f..2e9f0d0fb1a0afda74095fb70b4383b3602264ae 100644 (file)
--- a/gdb/config/djgpp/config.sed
+++ b/gdb/config/djgpp/config.sed
@@ -5,7 +5,7 @@ s|\.gdbinit|gdb.ini|g
 
 /^ac_given_INSTALL=/,/^CEOF/ {
   /^s%@prefix@%/a\
-  s,\\([yp*]\\)\\.tab,\\1_tab,g\
+  s,\\([yps*]\\)\\.tab,\\1_tab,g\
   /^   @rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],\
   s,standards\\.info\\*,standard*.inf*,\
   s,configure\\.info\\*,configur*.inf*,\