diff --git a/reactos/tools/wpp/Makefile.in b/reactos/tools/wpp/Makefile.in deleted file mode 100644 index 09ffbe122d7..00000000000 --- a/reactos/tools/wpp/Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -LEXOPT = -Cf #-w -b -YACCOPT = #-v -MODULE = libwpp.a - -C_SRCS = \ - preproc.c \ - wpp.c - -EXTRA_SRCS = ppy.y ppl.l -EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o - -all: $(MODULE) - -@MAKE_RULES@ - -$(MODULE): $(OBJS) - $(RM) $@ - $(AR) $@ $(OBJS) - $(RANLIB) $@ - -y.tab.c y.tab.h: ppy.y - $(YACC) $(YACCOPT) -ppp -d -t $(SRCDIR)/ppy.y - -# hack to allow parallel make -y.tab.h: y.tab.c -y.tab.o: y.tab.h - -@LEX_OUTPUT_ROOT@.c: ppl.l - $(LEX) $(LEXOPT) -d -Ppp -o$@ -8 $(SRCDIR)/ppl.l - -@LEX_OUTPUT_ROOT@.o: y.tab.h - -### Dependencies: diff --git a/reactos/tools/wpp/lex.yy.c b/reactos/tools/wpp/lex.yy.c index d5d6a82cc5e..cd830109e7f 100644 --- a/reactos/tools/wpp/lex.yy.c +++ b/reactos/tools/wpp/lex.yy.c @@ -13901,7 +13901,7 @@ char *yytext; #include #include "wpp_private.h" -#include "wpp.tab.h" +#include "ppy.tab.h" /* * Make sure that we are running an appropriate version of flex. diff --git a/reactos/tools/wpp/ppl.l b/reactos/tools/wpp/ppl.l index f4f8bc1bbe2..9e11301a7fb 100644 --- a/reactos/tools/wpp/ppl.l +++ b/reactos/tools/wpp/ppl.l @@ -163,7 +163,7 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] #include #include "wpp_private.h" -#include "wpp.tab.h" +#include "ppy.tab.h" /* * Make sure that we are running an appropriate version of flex. diff --git a/reactos/tools/wpp/wpp.tab.c b/reactos/tools/wpp/ppy.tab.c similarity index 99% rename from reactos/tools/wpp/wpp.tab.c rename to reactos/tools/wpp/ppy.tab.c index 9c5d4559193..f622320bb28 100644 --- a/reactos/tools/wpp/wpp.tab.c +++ b/reactos/tools/wpp/ppy.tab.c @@ -282,7 +282,7 @@ typedef union YYSTYPE { mtext_t *mtext; } YYSTYPE; /* Line 191 of yacc.c. */ -#line 287 "wpp/wpp.tab.c" +#line 287 "wpp/ppy.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -294,7 +294,7 @@ typedef union YYSTYPE { /* Line 214 of yacc.c. */ -#line 299 "wpp/wpp.tab.c" +#line 299 "wpp/ppy.tab.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -1853,7 +1853,7 @@ yyreduce: } /* Line 999 of yacc.c. */ -#line 1858 "wpp/wpp.tab.c" +#line 1858 "wpp/ppy.tab.c" yyvsp -= yylen; yyssp -= yylen; diff --git a/reactos/tools/wpp/wpp.tab.h b/reactos/tools/wpp/ppy.tab.h similarity index 99% rename from reactos/tools/wpp/wpp.tab.h rename to reactos/tools/wpp/ppy.tab.h index db59ae6fce1..a8eed262d7e 100644 --- a/reactos/tools/wpp/wpp.tab.h +++ b/reactos/tools/wpp/ppy.tab.h @@ -139,7 +139,7 @@ typedef union YYSTYPE { mtext_t *mtext; } YYSTYPE; /* Line 1252 of yacc.c. */ -#line 143 "wpp/wpp.tab.h" +#line 143 "wpp/ppy.tab.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 diff --git a/reactos/tools/wpp/wpp.mak b/reactos/tools/wpp/wpp.mak index 404996d1b64..a17bf6ebd3a 100644 --- a/reactos/tools/wpp/wpp.mak +++ b/reactos/tools/wpp/wpp.mak @@ -22,7 +22,7 @@ WPP_SOURCES = $(addprefix $(WPP_BASE_), \ lex.yy.c \ preproc.c \ wpp.c \ - wpp.tab.c \ + ppy.tab.c \ ) WPP_OBJECTS = \ @@ -49,7 +49,7 @@ $(WPP_INT_)wpp.o: $(WPP_BASE_)wpp.c | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(WPP_INT_)wpp.tab.o: $(WPP_BASE_)wpp.tab.c | $(WPP_INT) +$(WPP_INT_)ppy.tab.o: $(WPP_BASE_)ppy.tab.c | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@