From 954d8cae714c546dd87fcb19ab32fe50d59cadc1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 19 Nov 2010 18:10:51 +0000 Subject: [PATCH] 2010-11-19 Jan Kratochvil Tom Tromey * Makefile.in (.y.c): Directly create $@ from YLWRAP. (.PHONY): Remove for .y outputs. --- gdb/ChangeLog | 6 ++++++ gdb/Makefile.in | 20 ++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6997f0d4492..39d48ef35ae 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2010-11-19 Jan Kratochvil + Tom Tromey + + * Makefile.in (.y.c): Directly create $@ from YLWRAP. + (.PHONY): Remove for .y outputs. + 2010-11-19 Will Drewry Tavis Ormandy Jan Kratochvil diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 550badfdeb5..debda3647bb 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1615,8 +1615,10 @@ po/$(PACKAGE).pot: force .SUFFIXES: .y .l .y.c: - $(SHELL) $(YLWRAP) $< y.tab.c $@.tmp -- $(YACC) $(YFLAGS) - -sed -e '/extern.*malloc/d' \ + rm -f $@ $@.tmp + $(SHELL) $(YLWRAP) $< y.tab.c $@ -- $(YACC) $(YFLAGS) && mv $@ $@.tmp \ + || (rm -f $@; false) + sed -e '/extern.*malloc/d' \ -e '/extern.*realloc/d' \ -e '/extern.*free/d' \ -e '/include.*malloc.h/d' \ @@ -1625,9 +1627,9 @@ po/$(PACKAGE).pot: force -e 's/\([ \t;,(]\)free\([ \t]*[&(),]\)/\1xfree\2/g' \ -e 's/\([ \t;,(]\)free$$/\1xfree/g' \ -e '/^#line.*y.tab.c/d' \ - < $@.tmp > $@.new - -rm $@.tmp - mv $@.new ./$*.c + -e "s/^\(#line.*\)`basename $<`/\1`echo $<|sed 's/\//\\\\\//g'`/" \ + < $@.tmp > $@ + rm -f $@.tmp .l.c: if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \ $(FLEX) -o$@ $< && \ @@ -1651,13 +1653,7 @@ po/$(PACKAGE).pot: force false; \ fi -.PRECIOUS: ada-exp.c ada-lex.c -.PRECIOUS: c-exp.c -.PRECIOUS: f-exp.c -.PRECIOUS: jv-exp.c -.PRECIOUS: m2-exp.c -.PRECIOUS: objc-exp.c -.PRECIOUS: p-exp.c +.PRECIOUS: ada-exp.c # XML rules -- 2.30.2