diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 1996-02-09 22:43:25 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 1996-02-09 22:43:25 +0000 |
| commit | de9554eb8ae74764555178fc8bdf04cad9f3aa82 (patch) | |
| tree | dbdec03f770326fec3f6cb1f409d09b2e0054728 /gcc/cp/Makefile.in | |
| parent | 9b7b9c339c3432328310ed68b939612c9874d17e (diff) | |
| download | gcc-de9554eb8ae74764555178fc8bdf04cad9f3aa82.tar.gz | |
81st Cygnus<->FSF merge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@11187 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/Makefile.in')
| -rw-r--r-- | gcc/cp/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index 7ba077e7552..8bfbb125cc3 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -196,7 +196,7 @@ 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,^\./,,'` -CONFLICTS = expect 5 shift/reduce conflicts and 38 reduce/reduce conflicts. +CONFLICTS = expect 7 shift/reduce conflicts and 38 reduce/reduce conflicts. $(PARSE_H) : $(PARSE_C) $(PARSE_C) : $(srcdir)/parse.y @echo $(CONFLICTS) |