Move autotestkeywords to testsuite

All the 'make check' and installed tests are now in testsuite/,
and tests/ is just a collection manual test programs.

tests/Makefile.am

@@ -178,22 +178,6 @@ if USE_X11
 noinst_PROGRAMS += testerrors
 endif
 
-if HAVE_CXX
-
-AM_CXXFLAGS = $(AM_CPPFLAGS)
-
-noinst_PROGRAMS += autotestkeywords
-TESTS = autotestkeywords
-
-autotestkeywords_SOURCES = autotestkeywords.cc
-autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
-
-if HAVE_OBJC
-autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++
-endif
-
-endif
-
 animated_resizing_DEPENDENCIES = $(TEST_DEPS)
 animated_revealing_DEPENDENCIES = $(TEST_DEPS)
 flicker_DEPENDENCIES = $(TEST_DEPS)
@@ -582,9 +566,4 @@ EXTRA_DIST += 			\
 	popover.ui		\
 	selectionmode.ui
 
-CLEANFILES = 			\
-	autotestkeywords.log	\
-	autotestkeywords.trs	\
-	test-suite.log
-
 -include $(top_srcdir)/git.mk

testsuite/gtk/Makefile.am

@@ -80,6 +80,21 @@ if OS_UNIX
 #TEST_PROGS			+= defaultvalue
 endif
 
+if HAVE_CXX
+
+AM_CXXFLAGS = $(AM_CPPFLAGS)
+
+TEST_PROGS += autotestkeywords
+
+autotestkeywords_SOURCES = autotestkeywords.cc
+autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
+
+if HAVE_OBJC
+autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++
+endif
+
+endif
+
 treemodel_SOURCES = 		\
 	treemodel.h 		\
 	treemodel.c 		\