changeset 7452:08649ddd0df1

[project @ 2008-02-06 10:40:01 by jwe]
author jwe
date Wed, 06 Feb 2008 10:40:02 +0000
parents 663315fc5820
children b1cfd33a364b
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 5 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Feb 06 10:22:48 2008 +0000
+++ b/src/ChangeLog	Wed Feb 06 10:40:02 2008 +0000
@@ -1,5 +1,8 @@
 2008-02-06  John W. Eaton  <jwe@octave.org>
 
+	* Makefile.in (parse.cc): Use "-o $@" instead of renaming y.tab.c.
+	(maintainer-clean): Don't remove y.tab.c.
+
 	* Makefile.in (parse.cc : parse.y): Use mv instead of move-if-change.
 	(stamp-prereq, stamp-liboctave-prereq): Eliminate.
 	(clean): Don't remove stamp-prereq and stamp-liboctave-prereq.
--- a/src/Makefile.in	Wed Feb 06 10:22:48 2008 +0000
+++ b/src/Makefile.in	Wed Feb 06 10:40:02 2008 +0000
@@ -526,7 +526,7 @@
 .PHONY: distclean
 
 maintainer-clean: distclean
-	rm -f tags TAGS y.tab.c y.tab.h y.output yy.lex.c lex.cc parse.cc
+	rm -f tags TAGS y.tab.h y.output yy.lex.c lex.cc parse.cc
 	rm -f oct-gperf.h $(OPT_HANDLERS)
 .PHONY: maintainer-clean
 
@@ -561,14 +561,7 @@
 
 parse.cc : parse.y
 	@echo "expect 14 shift/reduce conflicts"
-	$(YACC) $(YFLAGS) $<
-	@if [ -s y.tab.c ]; then \
-	  mv y.tab.c $(@F); \
-	else \
-	  echo "y.tab.c is empty!" 1>&2; \
-	  rm -f y.tab.c; \
-	  exit 1; \
-	fi
+	$(YACC) $(YFLAGS) -o $@ $<
 
 lex.cc : lex.l
 	$(LEX) $(LFLAGS) $< > $(@F)-t