2 files changed, 22 insertions, 16 deletions
diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am
index 374617b7e4..85e89a50af 100644
--- a/testsuites/samples/Makefile.am
+++ b/testsuites/samples/Makefile.am
@@ -1,18 +1,24 @@
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-_SUBDIRS = hello capture ticker base_sp unlimited minimum fileio
+_SUBDIRS  =
+_SUBDIRS += base_sp
+_SUBDIRS += capture
+_SUBDIRS += fileio
+_SUBDIRS += hello
+_SUBDIRS += minimum
+_SUBDIRS += nsecs
+_SUBDIRS += paranoia
+_SUBDIRS += ticker
+_SUBDIRS += unlimited
 
 if MPTESTS
 ## base_mp is a sample multiprocessing test
 _SUBDIRS += base_mp
 endif
 
-_SUBDIRS += paranoia
-
-_SUBDIRS += nsecs
-
 if CXXTESTS
-_SUBDIRS += iostream cdtest
+_SUBDIRS += cdtest
+_SUBDIRS += iostream
 endif
 
 if NETTESTS
@@ -24,5 +30,5 @@ _SUBDIRS += pppd
 endif
 endif
 
-include $(top_srcdir)/../automake/test-subdirs.am
+include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/configure.ac b/testsuites/samples/configure.ac
index 91a36612df..ffe1bad2c2 100644
--- a/testsuites/samples/configure.ac
+++ b/testsuites/samples/configure.ac
@@ -37,7 +37,7 @@ AS_IF([test $HAS_CPLUSPLUS = yes],[
   [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE],
   [AC_COMPILE_IFELSE(
     [AC_LANG_PROGRAM(
-      [[#include <iostream>]], 
+      [[#include <iostream>]],
       [[std::cout << "hello" << std::endl;]])
     ],
     [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE=yes],
@@ -60,21 +60,21 @@ AC_CHECK_SIZEOF([time_t])
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
+base_mp/Makefile
+base_mp/node1/Makefile
+base_mp/node2/Makefile
 base_sp/Makefile
+capture/Makefile
+cdtest/Makefile
+fileio/Makefile
 hello/Makefile
+iostream/Makefile
 loopback/Makefile
 minimum/Makefile
-fileio/Makefile
 nsecs/Makefile
 paranoia/Makefile
+pppd/Makefile
 ticker/Makefile
 unlimited/Makefile
-base_mp/Makefile
-base_mp/node1/Makefile
-base_mp/node2/Makefile
-iostream/Makefile
-cdtest/Makefile
-pppd/Makefile
-capture/Makefile
 ])
 AC_OUTPUT