[2/2] crosstest: Fix the crosstest dependencies.
Francois Gouget
fgouget at free.fr
Sun Jun 28 06:29:51 CDT 2009
We now tell makedep to generate dependencies for the .cross.o files too.
---
I got annoyed that 'make crosstest' would regularly fail and yet, after
a make clean it would work fine. So I looked into it and I discovered
that the .cross.o files have no dependencies. So I hope this will make
the builds more robust.
Make.rules.in | 2 +-
dlls/Maketest.rules.in | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index c01a2b7..7f72099 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -229,7 +229,7 @@ $(SUBDIRS:%=%/__depend__): dummy
@cd `dirname $@` && $(MAKE) depend
depend: $(SUBDIRS:%=%/__depend__) dummy
- $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS)
+ $(MAKEDEP) $(MAKEDEPFLAGS) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS)
.PHONY: depend $(SUBDIRS:%=%/__depend__)
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index b112c45..85cff06 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -24,6 +24,7 @@ EXTRA_OBJS = testlist.o
CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe
CROSSCC = @CROSSCC@
CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR)
+MAKEDEPFLAGS = -oo:cross.o
@MAKE_RULES@
--
1.6.3.1
More information about the wine-patches
mailing list