Sync to Wine-20050930:

Alexandre Julliard <julliard@winehq.org>
- 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.

svn path=/trunk/; revision=18322

reactos/tools/wpp/Makefile.in

@@ -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:

reactos/tools/wpp/lex.yy.c

@@ -13901,7 +13901,7 @@ char *yytext;
 #include <assert.h>
 
 #include "wpp_private.h"
-#include "wpp.tab.h"
+#include "ppy.tab.h"
 
 /*
  * Make sure that we are running an appropriate version of flex.

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 <assert.h>
 
 #include "wpp_private.h"
-#include "wpp.tab.h"
+#include "ppy.tab.h"
 
 /*
  * Make sure that we are running an appropriate version of flex.

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;

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

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 $@