From 44cff7e9ecbd5c26cdc1f9765802c3bfbba12694 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 25 Mar 2010 11:06:37 +0100
Subject: [PATCH] makefiles: Output all the test rules explicitly for each
 module.

---
 Makefile.in | 21 +--------------------
 aclocal.m4  | 16 +++++++++++-----
 configure   | 18 +++++++++++-------
 3 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4fd69e14d4c..bce8b399d81 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,6 @@ ALL_DLL_DIRS       = @ALL_DLL_DIRS@
 ALL_INSTALL_DIRS   = @ALL_INSTALL_DIRS@
 ALL_PROGRAM_DIRS   = @ALL_PROGRAM_DIRS@
 ALL_STATICLIB_DIRS = @ALL_STATICLIB_DIRS@
-ALL_TEST_DIRS      = @ALL_TEST_DIRS@
 ALL_TOOL_DIRS      = @ALL_TOOL_DIRS@
 ALL_TOP_DIRS       = @ALL_TOP_DIRS@
 
@@ -43,8 +42,7 @@ BUILDSUBDIRS = \
 	$(ALL_TOP_DIRS) \
 	$(ALL_STATICLIB_DIRS) \
 	$(ALL_DLL_DIRS) \
-	$(ALL_PROGRAM_DIRS) \
-	$(ALL_TEST_DIRS)
+	$(ALL_PROGRAM_DIRS)
 
 # Sub-directories to run make install/uninstall into
 INSTALLSUBDIRS = \
@@ -140,22 +138,6 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy
 uninstall::
 	-rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
 
-# Rules for testing
-
-$(ALL_TEST_DIRS:%=%/__test__): dummy
-	@cd `dirname $@` && $(MAKE) test
-
-$(ALL_TEST_DIRS:%=%/__crosstest__): dummy
-	@cd `dirname $@` && $(MAKE) crosstest
-
-check test:: $(ALL_TEST_DIRS:%=%/__test__)
-crosstest:: $(ALL_TEST_DIRS:%=%/__crosstest__)
-
-testclean::
-	$(RM) $(ALL_TEST_DIRS:%=%/*.ok)
-
-.PHONY: check test testclean crosstest $(ALL_TEST_DIRS:%=%/__test__) $(ALL_TEST_DIRS:%=%/__crosstest__)
-
 # Rules for auto documentation
 
 DOCSUBDIRS = $(ALL_DLL_DIRS)
@@ -193,7 +175,6 @@ __builddeps__ __buildcrossdeps__: __tooldeps__ include
 loader server: libs/port libs/wine tools
 fonts: tools
 include: tools/widl
-programs/winetest: $(ALL_TEST_DIRS)
 libs/wine $(ALL_TOOL_DIRS): libs/port
 tools/wmc tools/wrc: tools
 tools tools/wmc tools/wrc: libs/wine
diff --git a/aclocal.m4 b/aclocal.m4
index c5521da2112..183a81d6034 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -152,7 +152,6 @@ AC_SUBST(ALL_DLL_DIRS,"")
 AC_SUBST(ALL_TOOL_DIRS,"")
 AC_SUBST(ALL_STATICLIB_DIRS,"")
 AC_SUBST(ALL_INSTALL_DIRS,"")
-AC_SUBST(ALL_TEST_DIRS,"")
 AC_SUBST(ALL_TEST_BINARIES,"")
 AC_SUBST(ALL_PROGRAM_DIRS,"")
 AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
@@ -284,12 +283,19 @@ $ac_name.rc:
 $ac_name.res: $ac_name.rc $ac_name.exe"
     wine_fn_append_file ALL_DIRS $ac_dir
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"$ac_dir: __builddeps__
-$ac_dir/__crosstest__: __buildcrossdeps__
-$ac_dir/__clean__ $ac_dir/__crosstest__ $ac_dir: $ac_dir/Makefile
+"$ac_dir/__clean__: $ac_dir/Makefile
 $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.rules \$(MAKEDEP)
 	@./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend"
-    AS_VAR_IF([enable_tests],[no],,[wine_fn_append_file ALL_TEST_DIRS $ac_dir])
+
+    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__
+	@cd $ac_dir && \$(MAKE) crosstest
+test::
+	@cd $ac_dir && \$(MAKE) test
+testclean::
+	\$(RM) $ac_dir/*.ok"])
 }
 
 wine_fn_config_tool ()
diff --git a/configure b/configure
index 11bc7b498ca..6dae0042afc 100755
--- a/configure
+++ b/configure
@@ -599,7 +599,6 @@ LIBOBJS
 ALL_PROGRAM_BIN_INSTALL_DIRS
 ALL_PROGRAM_DIRS
 ALL_TEST_BINARIES
-ALL_TEST_DIRS
 ALL_INSTALL_DIRS
 ALL_STATICLIB_DIRS
 ALL_TOOL_DIRS
@@ -13874,8 +13873,6 @@ ALL_STATICLIB_DIRS=""
 
 ALL_INSTALL_DIRS=""
 
-ALL_TEST_DIRS=""
-
 ALL_TEST_BINARIES=""
 
 ALL_PROGRAM_DIRS=""
@@ -14022,15 +14019,22 @@ $ac_name.rc:
 $ac_name.res: $ac_name.rc $ac_name.exe"
     wine_fn_append_file ALL_DIRS $ac_dir
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"$ac_dir: __builddeps__
-$ac_dir/__crosstest__: __buildcrossdeps__
-$ac_dir/__clean__ $ac_dir/__crosstest__ $ac_dir: $ac_dir/Makefile
+"$ac_dir/__clean__: $ac_dir/Makefile
 $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.rules \$(MAKEDEP)
 	@./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend"
+
     if test "x$enable_tests" = x""no; then :
 
 else
-  wine_fn_append_file ALL_TEST_DIRS $ac_dir
+  wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"all programs/winetest: $ac_dir
+$ac_dir: $ac_dir/Makefile __builddeps__
+crosstest:: $ac_dir/Makefile __buildcrossdeps__
+	@cd $ac_dir && \$(MAKE) crosstest
+test::
+	@cd $ac_dir && \$(MAKE) test
+testclean::
+	\$(RM) $ac_dir/*.ok"
 fi
 }