Module: wine Branch: master Commit: 9644d1dcd7e0ea6a5ec77f667e9c07d3ab938186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9644d1dcd7e0ea6a5ec77f667e...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Feb 8 20:58:00 2010 +0100
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 a0935bd..1ad05bf 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 3c651be..4d7e1ab 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 6373796..587825a 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 8600b9f..ec0de40 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 713ee4d..48869a7 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 e4880fb..f3aef2c 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 d0fea83..21b8443 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 fba92ea..05f7e90 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 c8a8534..3aa8647 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