From 24c3c5ed879305c32c1c355f54f5d833a42442d0 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 24 May 2000 03:31:04 +0000
Subject: [PATCH] Revived the GEN_C_SRCS variable to support wrc lex/yacc
 sources.

---
 Make.rules.in         | 13 +++++++------
 tools/wrc/Makefile.in |  9 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 0744c98c1f7..9d97284fae9 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -9,6 +9,7 @@
 # Each individual makefile may define the following additional variables:
 # C_SRCS       : C sources for the module
 # ASM_SRCS     : assembly sources
+# GEN_C_SRCS   : generated C files
 # GEN_ASM_SRCS : generated assembly sources
 # RC_SRCS      : resource source files
 # SPEC_SRCS    : interface definition files
@@ -74,10 +75,10 @@ mandir          = @mandir@
 prog_manext     = 1
 conf_manext     = 5
 includedir      = @includedir@/wine
-CLEAN_FILES     = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc \
-                  *.spec.c *.glue.c y.tab.c y.tab.h lex.yy.c core
+CLEAN_FILES     = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
+                  *.flc *.spec.c *.glue.c y.tab.c y.tab.h lex.yy.c core
 
-OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
+OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
        $(ASM_SRCS:.S=.o) $(RC_SRCS:.rc=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)
 
 LINTS = $(C_SRCS:.c=.ln)
@@ -250,8 +251,8 @@ winapi_check::
 $(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
 	cd `dirname $@` && $(MAKE) depend
 
-depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(SUBDIRS:%=%/__depend__)
-	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS)
+depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__)
+	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) -C. $(GEN_C_SRCS)
 
 # Rules for cleaning
 
@@ -262,7 +263,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
 	-cd `dirname $@` && $(RM) $(CLEAN_FILES)
 
 clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
-	$(RM) $(CLEAN_FILES) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(PROGRAMS)
+	$(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(PROGRAMS)
 
 # Misc. rules
 
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index a17cd4ffff1..17624d38b97 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -19,12 +19,13 @@ C_SRCS = \
 	wrc.c \
 	writeres.c
 
-EXTRA_SRCS = parser.y parser.l ppl.l ppy.y  ppy.tab.c lex.ppl.c
-EXTRA_OBJS = y.tab.o lex.yy.o ppy.tab.o lex.ppl.o
+GEN_C_SRCS = ppy.tab.c lex.ppl.c
+EXTRA_SRCS = parser.y parser.l
+EXTRA_OBJS = y.tab.o lex.yy.o
 
 all: $(PROGRAMS)
 
-depend: y.tab.h ppy.tab.h ppy.tab.c lex.ppl.c
+depend: y.tab.h ppy.tab.h
 
 @MAKE_RULES@
 
@@ -44,7 +45,7 @@ lex.ppl.c: ppl.l
 	$(LEX) $(LEXOPT) -d -Ppp -8 -olex.ppl.c $(SRCDIR)/ppl.l
 
 clean::
-	$(RM) y.tab.c y.tab.h lex.yy.c ppy.tab.c ppy.tab.h lex.ppl.c ppy.output lex.backup y.output
+	$(RM) ppy.tab.h ppy.output lex.backup y.output
 
 install:: $(PROGRAMS)
 	[ -d $(bindir) ] || $(MKDIR) $(bindir)