ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now that we are requiring bison anyway, make the .tab.c file use the

Browse Source 
same base name as the .y file, so that we can generate correct
dependencies in all cases.
This commit is contained in:
Alexandre Julliard 2005-09-28 18:17:08 +00:00
parent 1e26f9601d
commit cd91bc61be
17 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Make.rules.in
View File

@ -27,7 +27,6 @@ CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
BISON = @BISON@ BISON = @BISON@
YACC = $(BISON) -y
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@

4
libs/wpp/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
lex.yy.c lex.yy.c
y.tab.c ppy.tab.c
y.tab.h ppy.tab.h

13
libs/wpp/Makefile.in
View File

@ -3,7 +3,6 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
LEXOPT = -Cf #-w -b LEXOPT = -Cf #-w -b
YACCOPT = #-v
MODULE = libwpp.a MODULE = libwpp.a
C_SRCS = \ C_SRCS = \
@ -11,7 +10,7 @@ C_SRCS = \
wpp.c wpp.c
EXTRA_SRCS = ppy.y ppl.l EXTRA_SRCS = ppy.y ppl.l
EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o EXTRA_OBJS = ppy.tab.o @LEX_OUTPUT_ROOT@.o
all: $(MODULE) all: $(MODULE)
@ -22,16 +21,16 @@ $(MODULE): $(OBJS)
$(AR) $@ $(OBJS) $(AR) $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
y.tab.c y.tab.h: ppy.y ppy.tab.c ppy.tab.h: ppy.y
$(YACC) $(YACCOPT) -ppp -d -t $(SRCDIR)/ppy.y $(BISON) -ppp -d -t $(SRCDIR)/ppy.y -o ppy.tab.c
# hack to allow parallel make # hack to allow parallel make
y.tab.h: y.tab.c ppy.tab.h: ppy.tab.c
y.tab.o: y.tab.h ppy.tab.o: ppy.tab.h
@LEX_OUTPUT_ROOT@.c: ppl.l @LEX_OUTPUT_ROOT@.c: ppl.l
$(LEX) $(LEXOPT) -d -Ppp -o$@ -8 $(SRCDIR)/ppl.l $(LEX) $(LEXOPT) -d -Ppp -o$@ -8 $(SRCDIR)/ppl.l
@LEX_OUTPUT_ROOT@.o: y.tab.h @LEX_OUTPUT_ROOT@.o: ppy.tab.h
### Dependencies: ### Dependencies:

2
libs/wpp/ppl.l
View File

@ -161,7 +161,7 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL]
#include <assert.h> #include <assert.h>
#include "wpp_private.h" #include "wpp_private.h"
#include "y.tab.h" #include "ppy.tab.h"
/* /*
* Make sure that we are running an appropriate version of flex. * Make sure that we are running an appropriate version of flex.

4
programs/winedbg/.cvsignore
View File

@ -1,5 +1,5 @@
Makefile Makefile
dbg.tab.c
dbg.tab.h
lex.yy.c lex.yy.c
winedbg.exe.dbg.c winedbg.exe.dbg.c
y.tab.c
y.tab.h

12
programs/winedbg/Makefile.in
View File

@ -27,21 +27,21 @@ C_SRCS = \
winedbg.c winedbg.c
EXTRA_SRCS = dbg.y debug.l EXTRA_SRCS = dbg.y debug.l
EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o EXTRA_OBJS = dbg.tab.o @LEX_OUTPUT_ROOT@.o
@MAKE_PROG_RULES@ @MAKE_PROG_RULES@
y.tab.c y.tab.h: dbg.y dbg.tab.c dbg.tab.h: dbg.y
$(YACC) -d -t $(SRCDIR)/dbg.y $(BISON) -d -t $(SRCDIR)/dbg.y -o dbg.tab.c
# hack to allow parallel make # hack to allow parallel make
y.tab.h: y.tab.c dbg.tab.h: dbg.tab.c
y.tab.o: y.tab.h dbg.tab.o: dbg.tab.h
@LEX_OUTPUT_ROOT@.c: debug.l @LEX_OUTPUT_ROOT@.c: debug.l
$(LEX) -8 -I $(SRCDIR)/debug.l $(LEX) -8 -I $(SRCDIR)/debug.l
@LEX_OUTPUT_ROOT@.o: y.tab.h @LEX_OUTPUT_ROOT@.o: dbg.tab.h
install:: install::
$(MKINSTALLDIRS) $(mandir)/man$(prog_manext) $(MKINSTALLDIRS) $(mandir)/man$(prog_manext)

2
programs/winedbg/debug.l
View File

@ -25,7 +25,7 @@
#include <stdarg.h> #include <stdarg.h>
#include "debugger.h" #include "debugger.h"
#include "y.tab.h" #include "dbg.tab.h"
#undef YY_INPUT #undef YY_INPUT

2
tools/makedep.c
View File

@ -452,7 +452,7 @@ static void output_src( FILE *file, INCL_FILE *pFile, int *column )
*ext++ = 0; *ext++ = 0;
if (!strcmp( ext, "y" )) /* yacc file */ 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 */ else if (!strcmp( ext, "l" )) /* lex file */
{ {

4
tools/widl/.cvsignore
View File

@ -1,5 +1,5 @@
Makefile Makefile
lex.yy.c lex.yy.c
parser.tab.c
parser.tab.h
widl widl
y.tab.c
y.tab.h

13
tools/widl/Makefile.in
View File

@ -3,7 +3,6 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
LEXOPT = -Cf #-w -b LEXOPT = -Cf #-w -b
YACCOPT = #-v
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
PROGRAMS = widl$(EXEEXT) PROGRAMS = widl$(EXEEXT)
@ -21,7 +20,7 @@ C_SRCS = \
write_msft.c write_msft.c
EXTRA_SRCS = parser.y parser.l 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) all: $(PROGRAMS)
@ -30,17 +29,17 @@ all: $(PROGRAMS)
widl$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a widl$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_port $(LEXLIB) $(LDFLAGS) $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_port $(LEXLIB) $(LDFLAGS)
y.tab.c y.tab.h: parser.y parser.tab.c parser.tab.h: parser.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c
# hack to allow parallel make # hack to allow parallel make
y.tab.h: y.tab.c parser.tab.h: parser.tab.c
y.tab.o: y.tab.h parser.tab.o: parser.tab.h
@LEX_OUTPUT_ROOT@.c: parser.l @LEX_OUTPUT_ROOT@.c: parser.l
$(LEX) $(LEXOPT) -d -8 $(SRCDIR)/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) install:: $(PROGRAMS)
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)

2
tools/widl/parser.l
View File

@ -50,7 +50,7 @@ uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12}
#include "parser.h" #include "parser.h"
#include "wine/wpp.h" #include "wine/wpp.h"
#include "y.tab.h" #include "parser.tab.h"
#define YY_USE_PROTOS #define YY_USE_PROTOS
#define YY_NO_UNPUT #define YY_NO_UNPUT

4
tools/wmc/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
mcy.tab.c
mcy.tab.h
wmc wmc
y.tab.c
y.tab.h

13
tools/wmc/Makefile.in
View File

@ -2,7 +2,6 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
YACCOPT = #-v
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
PROGRAMS = wmc$(EXEEXT) PROGRAMS = wmc$(EXEEXT)
@ -16,23 +15,23 @@ C_SRCS = \
write.c write.c
EXTRA_SRCS = mcy.y EXTRA_SRCS = mcy.y
EXTRA_OBJS = y.tab.o EXTRA_OBJS = mcy.tab.o
all: $(PROGRAMS) all: $(PROGRAMS)
mcl.o: y.tab.h mcl.o: mcy.tab.h
@MAKE_RULES@ @MAKE_RULES@
wmc$(EXEEXT): $(OBJS) wmc$(EXEEXT): $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBUNICODE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBUNICODE) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
y.tab.c y.tab.h: mcy.y mcy.tab.c mcy.tab.h: mcy.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/mcy.y $(BISON) -d -t $(SRCDIR)/mcy.y -o mcy.tab.c
# hack to allow parallel make # hack to allow parallel make
y.tab.h: y.tab.c mcy.tab.h: mcy.tab.c
y.tab.o: y.tab.h mcy.tab.o: mcy.tab.h
install:: $(PROGRAMS) install:: $(PROGRAMS)
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)

2
tools/wmc/mcl.c
View File

@ -30,7 +30,7 @@
#include "wmc.h" #include "wmc.h"
#include "lang.h" #include "lang.h"
#include "y.tab.h" #include "mcy.tab.h"
/* /*
* Keywords are case insenitive. All normal input is treated as * Keywords are case insenitive. All normal input is treated as

6
tools/wrc/.cvsignore
View File

@ -1,7 +1,5 @@
Makefile Makefile
lex.yy.c lex.yy.c
parser.tab.c
parser.tab.h
wrc wrc
y.tab.c
y.tab.h
y.output
lex.backup

13
tools/wrc/Makefile.in
View File

@ -4,7 +4,6 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
LEXOPT = -Cf #-w -b LEXOPT = -Cf #-w -b
YACCOPT = #-v
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
PROGRAMS = wrc$(EXEEXT) PROGRAMS = wrc$(EXEEXT)
@ -21,7 +20,7 @@ C_SRCS = \
writeres.c writeres.c
EXTRA_SRCS = parser.y parser.l 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) all: $(PROGRAMS)
@ -30,17 +29,17 @@ all: $(PROGRAMS)
wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_unicode -lwine_port $(LEXLIB) $(LDFLAGS) $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_unicode -lwine_port $(LEXLIB) $(LDFLAGS)
y.tab.c y.tab.h: parser.y parser.tab.c parser.tab.h: parser.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c
# hack to allow parallel make # hack to allow parallel make
y.tab.h: y.tab.c parser.tab.h: parser.tab.c
y.tab.o: y.tab.h parser.tab.o: parser.tab.h
@LEX_OUTPUT_ROOT@.c: parser.l @LEX_OUTPUT_ROOT@.c: parser.l
$(LEX) $(LEXOPT) -d -8 $(SRCDIR)/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) install:: $(PROGRAMS)
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)

2
tools/wrc/parser.l
View File

@ -109,7 +109,7 @@ cident [a-zA-Z_][0-9a-zA-Z_]*
#include "parser.h" #include "parser.h"
#include "newstruc.h" #include "newstruc.h"
#include "y.tab.h" #include "parser.tab.h"
#define YY_USE_PROTOS #define YY_USE_PROTOS
#define YY_NO_UNPUT #define YY_NO_UNPUT