From eab7efd1792d16618608c75cf34b6095a34806d0 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 25 Mar 2010 21:42:54 +0100
Subject: [PATCH] makefiles: Fix test rules to allow parallel makes again.

---
 Makefile.in       | 2 +-
 Maketest.rules.in | 4 ++--
 aclocal.m4        | 6 ++++--
 configure         | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7a3bd80981..1df64c2552 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,7 +127,7 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy
 # dependencies needed to build any dll or program
 __tooldeps__: libs/port libs/wine libs/wpp
 __builddeps__ __buildcrossdeps__: __tooldeps__ include
-.PHONY: __tooldeps__ __builddeps__ __buildcrossdeps__
+.PHONY: test crosstest __tooldeps__ __builddeps__ __buildcrossdeps__
 
 loader server: libs/port libs/wine tools
 fonts: tools
diff --git a/Maketest.rules.in b/Maketest.rules.in
index c9ae6ea3e2..f04dc24aa9 100644
--- a/Maketest.rules.in
+++ b/Maketest.rules.in
@@ -41,13 +41,13 @@ testlist.o: testlist.c $(TOPSRCDIR)/include/wine/test.h
 
 # Rules for testing
 
-check test:: $(TESTRESULTS)
+check test: $(TESTRESULTS)
 
 $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT)
 
 # Rules for cross-compiling tests
 
-crosstest:: @CROSSTEST@
+crosstest: @CROSSTEST@
 
 $(CROSSTEST): $(CROSSOBJS) Makefile.in
 	$(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS)
diff --git a/aclocal.m4 b/aclocal.m4
index 253f1a4285..a3e2f497b7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -306,9 +306,11 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.
     AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all programs/winetest: $ac_dir
 $ac_dir: $ac_dir/Makefile __builddeps__
-crosstest:: $ac_dir/Makefile __buildcrossdeps__
+crosstest .PHONY: $ac_dir/__crosstest__
+$ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy
 	@cd $ac_dir && \$(MAKE) crosstest
-test::
+test .PHONY: $ac_dir/__test__
+$ac_dir/__test__: dummy
 	@cd $ac_dir && \$(MAKE) test
 testclean::
 	\$(RM) $ac_dir/*.ok"])
diff --git a/configure b/configure
index 60dc4ab95f..c4f0ca996a 100755
--- a/configure
+++ b/configure
@@ -14035,9 +14035,11 @@ else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all programs/winetest: $ac_dir
 $ac_dir: $ac_dir/Makefile __builddeps__
-crosstest:: $ac_dir/Makefile __buildcrossdeps__
+crosstest .PHONY: $ac_dir/__crosstest__
+$ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy
 	@cd $ac_dir && \$(MAKE) crosstest
-test::
+test .PHONY: $ac_dir/__test__
+$ac_dir/__test__: dummy
 	@cd $ac_dir && \$(MAKE) test
 testclean::
 	\$(RM) $ac_dir/*.ok"