Now that we are requiring bison anyway, make the .tab.c file use the
same base name as the .y file, so that we can generate correct
dependencies in all cases.
diff --git a/tools/makedep.c b/tools/makedep.c
index 0aec443..1b8cebc 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -452,7 +452,7 @@
*ext++ = 0;
if (!strcmp( ext, "y" )) /* yacc file */
{
- *column += fprintf( file, "y.tab.o: y.tab.c" );
+ *column += fprintf( file, "%s.tab.o: %s.tab.c", obj, obj );
}
else if (!strcmp( ext, "l" )) /* lex file */
{
diff --git a/tools/widl/.cvsignore b/tools/widl/.cvsignore
index dceff69..94dace7 100644
--- a/tools/widl/.cvsignore
+++ b/tools/widl/.cvsignore
@@ -1,5 +1,5 @@
Makefile
lex.yy.c
+parser.tab.c
+parser.tab.h
widl
-y.tab.c
-y.tab.h
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index 3cfcfe1..ff8ac5b 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -3,7 +3,6 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
LEXOPT = -Cf #-w -b
-YACCOPT = #-v
EXEEXT = @EXEEXT@
PROGRAMS = widl$(EXEEXT)
@@ -21,7 +20,7 @@
write_msft.c
EXTRA_SRCS = parser.y parser.l
-EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
+EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT@.o
all: $(PROGRAMS)
@@ -30,17 +29,17 @@
widl$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_port $(LEXLIB) $(LDFLAGS)
-y.tab.c y.tab.h: parser.y
- $(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y
+parser.tab.c parser.tab.h: parser.y
+ $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c
# hack to allow parallel make
-y.tab.h: y.tab.c
-y.tab.o: y.tab.h
+parser.tab.h: parser.tab.c
+parser.tab.o: parser.tab.h
@LEX_OUTPUT_ROOT@.c: parser.l
$(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l
-@LEX_OUTPUT_ROOT@.o: y.tab.h
+@LEX_OUTPUT_ROOT@.o: parser.tab.h
install:: $(PROGRAMS)
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index 7e33849..f4c7be2 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -50,7 +50,7 @@
#include "parser.h"
#include "wine/wpp.h"
-#include "y.tab.h"
+#include "parser.tab.h"
#define YY_USE_PROTOS
#define YY_NO_UNPUT
diff --git a/tools/wmc/.cvsignore b/tools/wmc/.cvsignore
index 92dc8ee..e7e9b33 100644
--- a/tools/wmc/.cvsignore
+++ b/tools/wmc/.cvsignore
@@ -1,4 +1,4 @@
Makefile
+mcy.tab.c
+mcy.tab.h
wmc
-y.tab.c
-y.tab.h
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index c42cddc..1b1ad03 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -2,7 +2,6 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-YACCOPT = #-v
EXEEXT = @EXEEXT@
PROGRAMS = wmc$(EXEEXT)
@@ -16,23 +15,23 @@
write.c
EXTRA_SRCS = mcy.y
-EXTRA_OBJS = y.tab.o
+EXTRA_OBJS = mcy.tab.o
all: $(PROGRAMS)
-mcl.o: y.tab.h
+mcl.o: mcy.tab.h
@MAKE_RULES@
wmc$(EXEEXT): $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBUNICODE) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
-y.tab.c y.tab.h: mcy.y
- $(YACC) $(YACCOPT) -d -t $(SRCDIR)/mcy.y
+mcy.tab.c mcy.tab.h: mcy.y
+ $(BISON) -d -t $(SRCDIR)/mcy.y -o mcy.tab.c
# hack to allow parallel make
-y.tab.h: y.tab.c
-y.tab.o: y.tab.h
+mcy.tab.h: mcy.tab.c
+mcy.tab.o: mcy.tab.h
install:: $(PROGRAMS)
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c
index 06bb58f..61710a2 100644
--- a/tools/wmc/mcl.c
+++ b/tools/wmc/mcl.c
@@ -30,7 +30,7 @@
#include "wmc.h"
#include "lang.h"
-#include "y.tab.h"
+#include "mcy.tab.h"
/*
* Keywords are case insenitive. All normal input is treated as
diff --git a/tools/wrc/.cvsignore b/tools/wrc/.cvsignore
index 3604ec7..af1bb91 100644
--- a/tools/wrc/.cvsignore
+++ b/tools/wrc/.cvsignore
@@ -1,7 +1,5 @@
Makefile
lex.yy.c
+parser.tab.c
+parser.tab.h
wrc
-y.tab.c
-y.tab.h
-y.output
-lex.backup
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 382ae16..c6f8bf8 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -4,7 +4,6 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
LEXOPT = -Cf #-w -b
-YACCOPT = #-v
EXEEXT = @EXEEXT@
PROGRAMS = wrc$(EXEEXT)
@@ -21,7 +20,7 @@
writeres.c
EXTRA_SRCS = parser.y parser.l
-EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
+EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT@.o
all: $(PROGRAMS)
@@ -30,17 +29,17 @@
wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_unicode -lwine_port $(LEXLIB) $(LDFLAGS)
-y.tab.c y.tab.h: parser.y
- $(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y
+parser.tab.c parser.tab.h: parser.y
+ $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c
# hack to allow parallel make
-y.tab.h: y.tab.c
-y.tab.o: y.tab.h
+parser.tab.h: parser.tab.c
+parser.tab.o: parser.tab.h
@LEX_OUTPUT_ROOT@.c: parser.l
$(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l
-@LEX_OUTPUT_ROOT@.o: y.tab.h
+@LEX_OUTPUT_ROOT@.o: parser.tab.h
install:: $(PROGRAMS)
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l
index 9983d10..d8abcad 100644
--- a/tools/wrc/parser.l
+++ b/tools/wrc/parser.l
@@ -109,7 +109,7 @@
#include "parser.h"
#include "newstruc.h"
-#include "y.tab.h"
+#include "parser.tab.h"
#define YY_USE_PROTOS
#define YY_NO_UNPUT
