Alexandre Julliard : Maketest.rules: Don't require testlist. c to be built before make depend.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Sep 11 11:22:12 CDT 2006


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

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

Maketest.rules: Don't require testlist.c to be built before make depend.

---

 dlls/Maketest.rules.in |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index 36e71a1..a7095a5 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -13,16 +13,16 @@ DLLFLAGS     = @DLLFLAGS@
 DEFS         = $(EXTRADEFS)
 
 MODULE       = $(TESTDLL:%.dll=%)_test.exe
-TESTLIST     = testlist.c
 TESTRESULTS  = $(CTESTS:.c=.ok)
 TESTPROGRAM  = $(MODULE)$(DLLEXT)
 RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(TOPOBJDIR) -p $(TESTPROGRAM)
 
-C_SRCS       = $(CTESTS) $(TESTLIST)
+C_SRCS       = $(CTESTS)
 ALL_LIBS     = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
+EXTRA_OBJS   = testlist.o
 
 CROSSTEST    = $(TESTDLL:%.dll=%)_crosstest.exe
-CROSSOBJS    = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o)
+CROSSOBJS    = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) testlist.cross.o
 CROSSCC      = @CROSSCC@
 CROSSWINDRES = @CROSSWINDRES@
 
@@ -42,10 +42,10 @@ # Rules for .exe main module
 
 # Rules for building test list
 
-$(TESTLIST): Makefile.in $(MAKECTESTS)
+testlist.c: Makefile.in $(MAKECTESTS)
 	$(MAKECTESTS) -o $@ $(CTESTS)
 
-depend: $(TESTLIST)
+testlist.o: testlist.c $(TOPSRCDIR)/include/wine/test.h
 
 # Rules for testing
 
@@ -74,4 +74,4 @@ testclean::
 	$(RM) $(TESTRESULTS)
 
 clean::
-	$(RM) $(MODULE) $(TESTLIST) $(TESTRESULTS) $(CROSSTEST)
+	$(RM) testlist.c $(MODULE) $(TESTRESULTS) $(CROSSTEST)




More information about the wine-cvs mailing list