aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <dje@cygnus.com>1994-12-09 23:19:15 +0000
committerDoug Evans <dje@gnu.org>1994-12-09 23:19:15 +0000
commit81cdf78761508bd7899d3b79bf0957d685b9b065 (patch)
tree90930485b73c98f40adb643988bc9923402805c5
parent52c0eaf8773922536cc9794c05e10428e6fe2b25 (diff)
downloadgcc-81cdf78761508bd7899d3b79bf0957d685b9b065.zip
gcc-81cdf78761508bd7899d3b79bf0957d685b9b065.tar.gz
gcc-81cdf78761508bd7899d3b79bf0957d685b9b065.tar.bz2
(BISONFLAGS): Delete --yacc.
(PARSE_H): Depend on $(PARSE_C), for parallel makes. (PARSE_C): Undo last patch. From-SVN: r8639
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/Makefile.in27
2 files changed, 20 insertions, 13 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2e957f1..3abbd86 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 9 18:17:37 1994 Doug Evans <dje@cygnus.com>
+
+ * Makefile.in (BISONFLAGS): Delete --yacc.
+ (PARSE_H): Depend on $(PARSE_C), for parallel makes.
+ (PARSE_C): Undo last patch.
+
Fri Dec 2 10:44:36 1994 Mike Stump (mrs@wombat.gnu.ai.mit.edu)
* Makefile.in (BISONFLAGS): Add --yacc so that output winds up in
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index ff48433..8cc6798 100644
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -55,7 +55,7 @@ T_CPPFLAGS =
CC = cc
BISON = bison
-BISONFLAGS = --yacc
+BISONFLAGS =
LEX = flex
LEXFLAGS =
AR = ar
@@ -194,19 +194,20 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \
`echo $(PARSE_C) | sed 's,^\./,,'`
-#$(PARSE_C) $(PARSE_H) : $(srcdir)/parse.y
-# @echo expect 1 shift/reduce confict and 34 reduce/reduce conflicts.
-# cd $(srcdir); $(BISON) $(BISONFLAGS) -d -o parse.c parse.y
-# cd $(srcdir); grep '^#define[ ]*YYEMPTY' parse.c >>parse.h
-$(PARSE_C) $(PARSE_H) : stamp-parse ; @true
-stamp-parse: $(srcdir)/parse.y
+$(PARSE_H) : $(PARSE_C)
+$(PARSE_C) : $(srcdir)/parse.y
@echo expect 1 shift/reduce confict and 34 reduce/reduce conflicts.
- $(BISON) $(BISONFLAGS) -d $(srcdir)/parse.y
- grep '^#define[ ]*YYEMPTY' y.tab.c >>y.tab.h
- $(srcdir)/../move-if-change y.tab.c $(PARSE_C)
- $(srcdir)/../move-if-change y.tab.h $(PARSE_H)
- cp $(PARSE_C) y.tab.c
- touch stamp-parse
+ cd $(srcdir); $(BISON) $(BISONFLAGS) -d -o parse.c parse.y
+ cd $(srcdir); grep '^#define[ ]*YYEMPTY' parse.c >>parse.h
+#$(PARSE_C) $(PARSE_H) : stamp-parse ; @true
+#stamp-parse: $(srcdir)/parse.y
+# @echo expect 1 shift/reduce confict and 34 reduce/reduce conflicts.
+# $(BISON) $(BISONFLAGS) -d $(srcdir)/parse.y
+# grep '^#define[ ]*YYEMPTY' y.tab.c >>y.tab.h
+# $(srcdir)/../move-if-change y.tab.c $(PARSE_C)
+# $(srcdir)/../move-if-change y.tab.h $(PARSE_H)
+# cp $(PARSE_C) y.tab.c
+# touch stamp-parse
# hash.h really depends on $(srcdir)/gxx.gperf.
# But this would screw things for people that don't have gperf,