From 9644d1dcd7e0ea6a5ec77f667e9c07d3ab938186 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 8 Feb 2010 20:58:00 +0100
Subject: [PATCH] makefiles: Generate a general catch-all dependency on .tab.h
 files to replace the manually maintained ones.

---
 configure                    | 2 +-
 configure.ac                 | 2 +-
 dlls/jscript/Makefile.in     | 2 --
 dlls/msi/Makefile.in         | 2 --
 libs/wpp/Makefile.in         | 2 --
 programs/winedbg/Makefile.in | 2 --
 tools/widl/Makefile.in       | 2 --
 tools/wmc/Makefile.in        | 2 --
 tools/wrc/Makefile.in        | 2 --
 9 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index a0935bd4e79..1ad05bfd443 100755
--- a/configure
+++ b/configure
@@ -13644,7 +13644,7 @@ DEPENDENCIES="### Dependencies:
 Makefile: dummy
 	-\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)
 
-\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS)
+\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(BISON_SRCS:.y=.tab.h)
 \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)
 \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)
 \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
diff --git a/configure.ac b/configure.ac
index 3c651be128f..4d7e1abb89a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2088,7 +2088,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies:
 Makefile: dummy
 	-\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)
 
-\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS)
+\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(BISON_SRCS:.y=.tab.h)
 \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)
 \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)
 \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index 63737966a9c..587825af9a2 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -45,5 +45,3 @@ BISON_SRCS = \
 parser.tab.c: parser.tab.h   # for parallel makes
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
-
-lex.o: parser.tab.h
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 8600b9ff058..ec0de402c89 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -91,5 +91,3 @@ RC_SRCS = \
 sql.tab.c: sql.tab.h   # for parallel makes
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
-
-tokenize.o: sql.tab.h
diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in
index 713ee4d9fb3..48869a7d2d3 100644
--- a/libs/wpp/Makefile.in
+++ b/libs/wpp/Makefile.in
@@ -23,5 +23,3 @@ $(MODULE): $(OBJS)
 ppy.tab.c: ppy.tab.h   # for parallel makes
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
-
-ppl.yy.o: ppy.tab.h
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index e4880fbcbc0..f3aef2cd06d 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -64,5 +64,3 @@ uninstall::
 dbg.tab.c: dbg.tab.h   # for parallel makes
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
-
-debug.yy.o: dbg.tab.h
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index d0fea834d38..21b844346c7 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -45,5 +45,3 @@ uninstall::
 parser.tab.c: parser.tab.h   # for parallel makes
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
-
-parser.yy.o: parser.tab.h
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index fba92ea3b23..05f7e90fab2 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -40,5 +40,3 @@ uninstall::
 mcy.tab.c: mcy.tab.h   # for parallel makes
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
-
-mcl.o: mcy.tab.h
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index c8a853483fe..3aa86470f93 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -45,5 +45,3 @@ uninstall::
 parser.tab.c: parser.tab.h   # for parallel makes
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
-
-parser.yy.o: parser.tab.h
-- 
2.11.4.GIT