[glib] glib.mk: Rework win32 test support

[Ryan Lortie <ryanl src gnome org>]

commit 16ec6295806131103e1ba08f8b23f5b9bbe05adb
Author: Ryan Lortie <desrt desrt ca>
Date:   Sat Jun 1 10:07:33 2013 -0400

    glib.mk: Rework win32 test support
    
    Newer versions of automake (~1.13.1) seem to generate some new rules for
    testcases that get tripped up on our use of $(addsuffix) and $(strip) so
    take those out of the definition of TESTS on win32.

 glib.mk |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/glib.mk b/glib.mk
index e38d066..6cea4a4 100644
--- a/glib.mk
+++ b/glib.mk
@@ -48,10 +48,6 @@ else
 test-nonrecursive:
 endif
 
-if OS_WIN32
-TESTS += $(addsuffix .exe, $(TEST_PROGS))
-endif
-
 # test-report: run tests in subdirs and generate report
 # perf-report: run tests in subdirs with -m perf and generate report
 # full-report: like test-report: with -m perf and -m slow
@@ -167,6 +163,11 @@ check-local: test-nonrecursive
 TEST_PROGS += $(strip $(test_programs) $(test_scripts) $(uninstalled_test_programs) 
$(uninstalled_test_scripts) \
                       $(dist_test_scripts) $(dist_uninstalled_test_scripts))
 
+if OS_WIN32
+TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
+         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
+endif
+
 # Note: build even the installed-only targets during 'make check' to ensure that they still work.
 # We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
 # prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were