Alexandre Julliard : makefiles: List bison dependencies explicitly for parallel makes, since older bisons don't support --defines.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Sep 12 07:30:06 CDT 2006


Module: wine
Branch: master
Commit: 145a0ba508487905fcc36ade66175908d615bb75
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=145a0ba508487905fcc36ade66175908d615bb75

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Sep 11 21:43:11 2006 +0200

makefiles: List bison dependencies explicitly for parallel makes, since older bisons don't support --defines.

---

 Make.rules.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 ++
 7 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 2cba40f..cc6d13c 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -130,7 +130,7 @@ # Implicit rules
 	$(BISON) $(BISONFLAGS) -o $@ $<
 
 .y.tab.h:
-	$(BISON) $(BISONFLAGS) --defines=$@ -o /dev/null $<
+	$(BISON) $(BISONFLAGS) -o $*.tab.c -d $<
 
 .l.yy.c:
 	$(LEX) $(LEXFLAGS) -t $< >$@ || ($(RM) $@ && exit 1)
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 3bd3783..3d8db09 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -58,6 +58,8 @@ RC_BINARIES = \
 
 @MAKE_DLL_RULES@
 
+sql.tab.c: sql.tab.h   # for parallel makes
+
 ### Dependencies:
 
 cond.tab.o: cond.tab.c
diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in
index ff6744c..246fb36 100644
--- a/libs/wpp/Makefile.in
+++ b/libs/wpp/Makefile.in
@@ -20,6 +20,8 @@ all: $(MODULE)
 	$(AR) $@ $(OBJS)
 	$(RANLIB) $@
 
+ppy.tab.c: ppy.tab.h   # for parallel makes
+
 ### Dependencies:
 
 ppy.tab.o: ppy.tab.c
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index 35a96d0..45829ad 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -43,6 +43,8 @@ install:: $(MANPAGES) $(DESTDIR)$(mandir
 uninstall::
 	$(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext)
 
+dbg.tab.c: dbg.tab.h   # for parallel makes
+
 ### Dependencies:
 
 dbg.tab.o: dbg.tab.c
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index a2afefc..86fa6fb 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -39,6 +39,8 @@ install:: $(PROGRAMS) $(MANPAGES) $(INST
 uninstall::
 	$(RM) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext)
 
+parser.tab.c: parser.tab.h   # for parallel makes
+
 ### Dependencies:
 
 parser.tab.o: parser.tab.c
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index a9b05b8..e762742 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -33,6 +33,8 @@ install:: $(PROGRAMS) $(MANPAGES) $(INST
 uninstall::
 	$(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext)
 
+mcy.tab.c: mcy.tab.h   # for parallel makes
+
 ### Dependencies:
 
 mcy.tab.o: mcy.tab.c
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 382f089..1133840 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -38,6 +38,8 @@ install:: $(PROGRAMS) $(MANPAGES) $(INST
 uninstall::
 	$(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext)
 
+parser.tab.c: parser.tab.h   # for parallel makes
+
 ### Dependencies:
 
 parser.tab.o: parser.tab.c




More information about the wine-cvs mailing list