Change from rth.

        * Makefile.in (BISON): Don't even pretend to use yacc.
        (c-exp.tab.o): Use bison -o to use a unique intermediate file.
        (jv-exp.tab.o, f-exp.tab.o, m2-exp.tab.o): Likewise.

1 files changed, 17 insertions, 14 deletions

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index d777b19..bb562f6 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -69,7 +69,7 @@ CC=@CC@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-YACC=@YACC@
+BISON=@BISON@
 
 # where to find makeinfo, preferably one designed for texinfo-2
 MAKEINFO=makeinfo
@@ -629,7 +629,7 @@ init.c: $(OBS) $(TSOBS)
 	@echo '#include "ansidecl.h"' >>init.c-tmp
 	@echo 'extern void initialize_all_files PARAMS ((void));' >>init.c-tmp
 	@echo 'void initialize_all_files PARAMS ((void)) {' >>init.c-tmp
-	@echo $(OBS) $(TSOBS) | \
+	@-echo $(OBS) $(TSOBS) | \
 	tr ' ' '\012' | \
 	sed -e '/^Onindy.o/d' \
 	    -e '/^nindy.o/d' \
@@ -851,7 +851,7 @@ version.c: Makefile
 # Makefile.in, but that was a pretty big annoyance.
 c-exp.tab.o: c-exp.tab.c
 c-exp.tab.c: c-exp.y
-	$(YACC) $(YFLAGS) $(srcdir)/c-exp.y
+	$(BISON) $(YFLAGS) -o c-exp.tmp $(srcdir)/c-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -859,13 +859,13 @@ c-exp.tab.c: c-exp.y
 	     -e 's/malloc/xmalloc/g' \
 	     -e 's/realloc/xrealloc/g' \
 	     -e '/^#line.*y.tab.c/d' \
-	  < y.tab.c > c-exp.new
-	-rm y.tab.c
+	  < c-exp.tmp > c-exp.new
+	-rm c-exp.tmp
 	mv c-exp.new ./c-exp.tab.c
 
 jv-exp.tab.o: jv-exp.tab.c
 jv-exp.tab.c: jv-exp.y
-	$(YACC) $(YFLAGS) $(srcdir)/jv-exp.y
+	$(BISON) $(YFLAGS) -o jv-exp.tmp $(srcdir)/jv-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -873,13 +873,13 @@ jv-exp.tab.c: jv-exp.y
 	     -e 's/malloc/xmalloc/g' \
 	     -e 's/realloc/xrealloc/g' \
 	     -e '/^#line.*y.tab.c/d' \
-	  < y.tab.c > jv-exp.new
-	-rm y.tab.c
+	  < jv-exp.tmp > jv-exp.new
+	-rm jv-exp.tmp
 	mv jv-exp.new ./jv-exp.tab.c
 
 f-exp.tab.o: f-exp.tab.c
 f-exp.tab.c: f-exp.y c-exp.tab.c
-	$(YACC) $(YFLAGS) $(srcdir)/f-exp.y
+	$(BISON) $(YFLAGS) -o f-exp.tmp $(srcdir)/f-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -887,8 +887,8 @@ f-exp.tab.c: f-exp.y c-exp.tab.c
 	     -e 's/malloc/xmalloc/g' \
 	     -e 's/realloc/xrealloc/g' \
 	     -e '/^#line.*y.tab.c/d' \
-	  < y.tab.c > f-exp.new
-	-rm y.tab.c
+	  < f-exp.tmp > f-exp.new
+	-rm f-exp.tmp
 	mv f-exp.new ./f-exp.tab.c
 
 # m2-exp.tab.c is generated in objdir from m2-exp.y if it doesn't exist
@@ -897,7 +897,7 @@ f-exp.tab.c: f-exp.y c-exp.tab.c
 # else.
 m2-exp.tab.o: m2-exp.tab.c
 m2-exp.tab.c: m2-exp.y
-	$(YACC) $(YFLAGS) $(srcdir)/m2-exp.y
+	$(BISON) $(YFLAGS) -o m2-exp.tmp $(srcdir)/m2-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -905,8 +905,8 @@ m2-exp.tab.c: m2-exp.y
 	     -e 's/malloc/xmalloc/g' \
 	     -e 's/realloc/xrealloc/g' \
 	     -e '/^#line.*y.tab.c/d' \
-	  < y.tab.c > m2-exp.new
-	-rm y.tab.c
+	  < m2-exp.tmp > m2-exp.new
+	-rm m2-exp.tmp
 	mv m2-exp.new ./m2-exp.tab.c
 
 # These files are updated atomically, so make never has to remove them
@@ -1374,6 +1374,9 @@ rdi-share/libangsd.a:	force
 	  true; \
 	fi
 
+remote-d10v.o: remote-d10v.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
+	$(inferior_h) $(remote_utils_h) symfile.h terminal.h gdb_string.h
+
 remote-rdp.o: remote-rdp.c $(wait_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) gdb_string.h