From a721b177d1cbe5bee463176d2683331cf94439c8 Mon Sep 17 00:00:00 2001
From: Markus Kauppila <markus.kauppila@gmail.com>
Date: Fri, 1 Jul 2011 17:11:20 +0300
Subject: [PATCH] Fixed a bunch of Makefile.am files.

---
 test/test-automation/SDL_test.h               | 10 +++++
 .../build-scripts/config.guess                |  9 ++--
 test/test-automation/build-scripts/config.sub | 19 +++++---
 test/test-automation/plain_logger.c           |  4 +-
 test/test-automation/testdummy/Makefile.am    |  2 +-
 test/test-automation/testplatform/Makefile.am |  2 +-
 test/test-automation/testplatform/Makefile.in | 45 ++++++++++++++++++-
 test/test-automation/testrect/Makefile.am     |  2 +-
 8 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/test/test-automation/SDL_test.h b/test/test-automation/SDL_test.h
index 1381caa94..45123549c 100644
--- a/test/test-automation/SDL_test.h
+++ b/test/test-automation/SDL_test.h
@@ -85,4 +85,14 @@ void AssertEquals(Uint32 expected, Uint32 actual, char *message, ...);
  */
 void AssertTrue(int condition, char *message, ...);
 
+/*!
+\todo add markup
+*/
+void AssertFail(char *message, ...);
+
+/*!
+\todo add markup
+*/
+void AssertPass(char *message, ...);
+
 #endif
diff --git a/test/test-automation/build-scripts/config.guess b/test/test-automation/build-scripts/config.guess
index dc84c68ef..c2246a4f7 100755
--- a/test/test-automation/build-scripts/config.guess
+++ b/test/test-automation/build-scripts/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/test/test-automation/build-scripts/config.sub b/test/test-automation/build-scripts/config.sub
index 2a55a5075..c2d125724 100755
--- a/test/test-automation/build-scripts/config.sub
+++ b/test/test-automation/build-scripts/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -380,7 +381,8 @@ case $basic_machine in
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -1085,6 +1087,11 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
@@ -1435,6 +1442,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
diff --git a/test/test-automation/plain_logger.c b/test/test-automation/plain_logger.c
index d7c0f4c9e..495df3103 100644
--- a/test/test-automation/plain_logger.c
+++ b/test/test-automation/plain_logger.c
@@ -78,9 +78,9 @@ PlainTestEnded(const char *testName, const char *suiteName,
 {
 	if(testResult) {
 		if(testResult == 2) {
-			Output("%s: failed -> no assert");
+			Output("%s: failed -> no assert", testName);
 		} else {
-			Output("%s: failed");
+			Output("%s: failed", testName);
 		}
 	} else {
 		Output("%s: ok", testName);
diff --git a/test/test-automation/testdummy/Makefile.am b/test/test-automation/testdummy/Makefile.am
index 07eb7359a..481614ce7 100644
--- a/test/test-automation/testdummy/Makefile.am
+++ b/test/test-automation/testdummy/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libtestdummy.la
-libtestdummy_la_SOURCES = testdummy.c ../SDL_test.c
+libtestdummy_la_SOURCES = testdummy.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
 libtestdummy_la_CLAGS = -fPIC -g
 libtestdummy_la_LDFLAGS = `sdl-config --libs`
 
diff --git a/test/test-automation/testplatform/Makefile.am b/test/test-automation/testplatform/Makefile.am
index b1c378d51..5a486f34f 100644
--- a/test/test-automation/testplatform/Makefile.am
+++ b/test/test-automation/testplatform/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libtestplatform.la
-libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c
+libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
 libtestplatform_la_CLAGS = -fPIC -g
 libtestplatform_la_LDFLAGS = `sdl-config --libs`
 
diff --git a/test/test-automation/testplatform/Makefile.in b/test/test-automation/testplatform/Makefile.in
index 7ae2d8a0f..d0f5b499d 100644
--- a/test/test-automation/testplatform/Makefile.in
+++ b/test/test-automation/testplatform/Makefile.in
@@ -73,7 +73,8 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libtestplatform_la_LIBADD =
-am_libtestplatform_la_OBJECTS = testplatform.lo SDL_test.lo
+am_libtestplatform_la_OBJECTS = testplatform.lo SDL_test.lo logger.lo \
+	logger_helpers.lo plain_logger.lo xml_logger.lo xml.lo
 libtestplatform_la_OBJECTS = $(am_libtestplatform_la_OBJECTS)
 libtestplatform_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -208,7 +209,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libtestplatform.la
-libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c
+libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
 libtestplatform_la_CLAGS = -fPIC -g
 libtestplatform_la_LDFLAGS = `sdl-config --libs`
 all: all-am
@@ -286,7 +287,12 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SDL_test.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger_helpers.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plain_logger.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testplatform.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_logger.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -316,6 +322,41 @@ SDL_test.lo: ../SDL_test.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o SDL_test.lo `test -f '../SDL_test.c' || echo '$(srcdir)/'`../SDL_test.c
 
+logger.lo: ../logger.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logger.lo -MD -MP -MF $(DEPDIR)/logger.Tpo -c -o logger.lo `test -f '../logger.c' || echo '$(srcdir)/'`../logger.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/logger.Tpo $(DEPDIR)/logger.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../logger.c' object='logger.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logger.lo `test -f '../logger.c' || echo '$(srcdir)/'`../logger.c
+
+logger_helpers.lo: ../logger_helpers.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logger_helpers.lo -MD -MP -MF $(DEPDIR)/logger_helpers.Tpo -c -o logger_helpers.lo `test -f '../logger_helpers.c' || echo '$(srcdir)/'`../logger_helpers.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/logger_helpers.Tpo $(DEPDIR)/logger_helpers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../logger_helpers.c' object='logger_helpers.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logger_helpers.lo `test -f '../logger_helpers.c' || echo '$(srcdir)/'`../logger_helpers.c
+
+plain_logger.lo: ../plain_logger.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_logger.lo -MD -MP -MF $(DEPDIR)/plain_logger.Tpo -c -o plain_logger.lo `test -f '../plain_logger.c' || echo '$(srcdir)/'`../plain_logger.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/plain_logger.Tpo $(DEPDIR)/plain_logger.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../plain_logger.c' object='plain_logger.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_logger.lo `test -f '../plain_logger.c' || echo '$(srcdir)/'`../plain_logger.c
+
+xml_logger.lo: ../xml_logger.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xml_logger.lo -MD -MP -MF $(DEPDIR)/xml_logger.Tpo -c -o xml_logger.lo `test -f '../xml_logger.c' || echo '$(srcdir)/'`../xml_logger.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_logger.Tpo $(DEPDIR)/xml_logger.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../xml_logger.c' object='xml_logger.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xml_logger.lo `test -f '../xml_logger.c' || echo '$(srcdir)/'`../xml_logger.c
+
+xml.lo: ../xml.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xml.lo -MD -MP -MF $(DEPDIR)/xml.Tpo -c -o xml.lo `test -f '../xml.c' || echo '$(srcdir)/'`../xml.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml.Tpo $(DEPDIR)/xml.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../xml.c' object='xml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xml.lo `test -f '../xml.c' || echo '$(srcdir)/'`../xml.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/test/test-automation/testrect/Makefile.am b/test/test-automation/testrect/Makefile.am
index 8ba4ab2d1..93c16984d 100644
--- a/test/test-automation/testrect/Makefile.am
+++ b/test/test-automation/testrect/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libtestrect.la
-libtestrect_la_SOURCES = testrect.c ../SDL_test.c
+libtestrect_la_SOURCES = testrect.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
 libtestrect_la_CLAGS = -fPIC -g
 libtestrect_la_LDFLAGS = `sdl-config --libs`