Two fixes for the testing framework makefiles

Francois Gouget fgouget at codeweavers.com
Sun Mar 31 20:48:04 CST 2002


   The first one, in Make.rules.in, makes sure that if you modify
wtmain.o, then all tests will be rebuilt. You would think that the .c.o
implicit rule should do that already, but this is not the case. I
suppose it's because the file is not in the local directory.
   The second one, in winetest/Makefile.in, fixes out of tree builds
(wine.xs may be in ../../../src/program/winetest).


Changelog:

   François Gouget <fgouget at codeweavers.com>

 * Make.rules.in,
   programs/winetest/Makefile.in

   Rebuild tests if wtmain.c has changed
   Support out-of-tree builds


-- 
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: Make.rules.in
===================================================================
RCS file: /home/wine/wine/Make.rules.in,v
retrieving revision 1.105
diff -u -r1.105 Make.rules.in
--- Make.rules.in	22 Mar 2002 01:00:34 -0000	1.105
+++ Make.rules.in	30 Mar 2002 19:15:29 -0000
@@ -265,7 +267,7 @@
 $(WINETEST):
 	cd $(TOPOBJDIR)/programs/winetest && $(MAKE) winetest
 
-$(TESTMAIN):
+$(TESTMAIN): $(TESTMAIN:.o=.c)
 	cd $(TOPOBJDIR)/programs/winetest && $(MAKE) wtmain.o
 
 $(TESTLIST): Makefile.in
Index: programs/winetest/Makefile.in
===================================================================
RCS file: /home/wine/wine/programs/winetest/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- programs/winetest/Makefile.in	14 Jan 2002 20:00:32 -0000	1.5
+++ programs/winetest/Makefile.in	30 Mar 2002 19:15:46 -0000
@@ -19,7 +19,7 @@
 
 @MAKE_PROG_RULES@
 
-wine.c: wine.xs
+wine.c: $(SRCDIR)/wine.xs
 	perl $(XSUBPPDIR)/xsubpp -typemap $(XSUBPPDIR)/typemap $(SRCDIR)/wine.xs >wine.c || $(RM) wine.c
 
 install::


More information about the wine-patches mailing list