7 files changed, 15 insertions, 33 deletions
diff --git a/testsuites/Makefile.am b/testsuites/Makefile.am
index f1e0b924a6..68a22cd69f 100644
--- a/testsuites/Makefile.am
+++ b/testsuites/Makefile.am
@@ -7,5 +7,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 SUBDIRS = @subdirs@
 
+EXTRA_DIST = PROBLEMS
+
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/testsuites/itrontests/Makefile.am b/testsuites/itrontests/Makefile.am
index 359cf6be50..b4c23c60b3 100644
--- a/testsuites/itrontests/Makefile.am
+++ b/testsuites/itrontests/Makefile.am
@@ -5,16 +5,10 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@
-
-PREINSTALLDIRS = $(project_bspdir)/tests/screens/itrontests
-$(PREINSTALLDIRS):
-	@$(mkinstalldirs) $@
-
-all-local: $(PREINSTALLDIRS)
-
-SUBDIRS = . itronhello itrontask01 itrontask02 itrontask03 itrontask04 \
+SUBDIRS = itronhello itrontask01 itrontask02 itrontask03 itrontask04 \
     itronmbf01 itronmbox01 itronsem01 itrontime01
 
+EXTRA_DIST = itrontests.am
+
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/mptests/Makefile.am b/testsuites/mptests/Makefile.am
index 04211afe91..8143d1b540 100644
--- a/testsuites/mptests/Makefile.am
+++ b/testsuites/mptests/Makefile.am
@@ -5,19 +5,10 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
-
-PREINSTALLDIRS = \
-    $(project_bspdir)/tests/screens/mptests \
-    $(project_bspdir)/tests/screens/mptests/node1 \
-    $(project_bspdir)/tests/screens/mptests/node2
-$(PREINSTALLDIRS):
-	@$(mkinstalldirs) $@
-
-all-local: $(PREINSTALLDIRS)
-
-SUBDIRS = . mp01 mp02 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \
+SUBDIRS = mp01 mp02 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \
     mp14
 
+EXTRA_DIST = mptests.am
+
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/tmitrontests/Makefile.am b/testsuites/tmitrontests/Makefile.am
index 3b10073729..2d5edaf1bc 100644
--- a/testsuites/tmitrontests/Makefile.am
+++ b/testsuites/tmitrontests/Makefile.am
@@ -5,17 +5,11 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@
-
-PREINSTALLDIRS = $(project_bspdir)/tests/screens/psxtests
-$(PREINSTALLDIRS):
-	@$(mkinstalldirs) $@
-
-all-local: $(PREINSTALLDIRS)
-
 ITRON_DIRS = include tmitronsem01
 
 SUBDIRS = $(ITRON_DIRS)
 
+EXTRA_DIST = tmitrontests.am
+
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/tmitrontests/include/timesys.h b/testsuites/tmitrontests/include/timesys.h
index 6dcc81d051..4a9ebf55ad 100644
--- a/testsuites/tmitrontests/include/timesys.h
+++ b/testsuites/tmitrontests/include/timesys.h
@@ -18,9 +18,10 @@
 /*
  *   How many times a particular operation is performed while timed.
  */
- 
+
+#ifndef OPERATION_COUNT 
 #define OPERATION_COUNT 100
-#define IT_COUNT        100
+#endif
 
 /* functions */
 
diff --git a/testsuites/tmtests/include/timesys.h b/testsuites/tmtests/include/timesys.h
index b2b6ac870f..5c21ae5d68 100644
--- a/testsuites/tmtests/include/timesys.h
+++ b/testsuites/tmtests/include/timesys.h
@@ -35,7 +35,7 @@
 
 #define put_time( _message, _total_time, \
                   _iterations, _loop_overhead, _overhead ) \
-    printf( \
+    fprintf( stderr, \
       "%s %d\n", \
       (_message), \
       (((_total_time) - (_loop_overhead)) / (_iterations)) - (_overhead) \
diff --git a/testsuites/tmtests/tm20/Makefile.am b/testsuites/tmtests/tm20/Makefile.am
index 080869c7f7..4f2c12728f 100644
--- a/testsuites/tmtests/tm20/Makefile.am
+++ b/testsuites/tmtests/tm20/Makefile.am
@@ -18,7 +18,7 @@ DOCTYPES = doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
 SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES) ../../$(ARCH)/stubdr.rel
+OBJS = $(C_O_FILES) ../../support/stubdr/$(ARCH)/stubdr.rel
 
 PRINT_SRCS = $(DOCS)