summaryrefslogtreecommitdiffstats
path: root/testsuites/tmitrontests
diff options
context:
space:
mode:
Diffstat (limited to 'testsuites/tmitrontests')
-rw-r--r--testsuites/tmitrontests/ChangeLog6
-rw-r--r--testsuites/tmitrontests/Makefile.am4
-rw-r--r--testsuites/tmitrontests/configure.ac1
-rw-r--r--testsuites/tmitrontests/include/.cvsignore2
-rw-r--r--testsuites/tmitrontests/include/Makefile.am7
5 files changed, 8 insertions, 12 deletions
diff --git a/testsuites/tmitrontests/ChangeLog b/testsuites/tmitrontests/ChangeLog
index d1e3124a6a..9b556f87d2 100644
--- a/testsuites/tmitrontests/ChangeLog
+++ b/testsuites/tmitrontests/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-26 Ralf Corsepius <ralf_corsepius@rtems.org>
+
+ * include/Makefile.am: Remove.
+ * Makefile.am: Merge-in include/Makefile.am.
+ * configure.ac: Reflect changes above.
+
2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add 2nd arg to RTEMS_TOP.
diff --git a/testsuites/tmitrontests/Makefile.am b/testsuites/tmitrontests/Makefile.am
index 52ca1069bf..9e3928f6fe 100644
--- a/testsuites/tmitrontests/Makefile.am
+++ b/testsuites/tmitrontests/Makefile.am
@@ -4,9 +4,9 @@
ACLOCAL_AMFLAGS = -I ../aclocal
-ITRON_DIRS = include tmitronsem01
+noinst_HEADERS = include/timesys.h
-SUBDIRS = $(ITRON_DIRS)
+SUBDIRS = tmitronsem01
EXTRA_DIST = tmitrontests.am
diff --git a/testsuites/tmitrontests/configure.ac b/testsuites/tmitrontests/configure.ac
index f3a3b86abf..17e5b848ff 100644
--- a/testsuites/tmitrontests/configure.ac
+++ b/testsuites/tmitrontests/configure.ac
@@ -32,7 +32,6 @@ AC_SUBST(OPERATION_COUNT)
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
-include/Makefile
tmitronsem01/Makefile
])
AC_OUTPUT
diff --git a/testsuites/tmitrontests/include/.cvsignore b/testsuites/tmitrontests/include/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/testsuites/tmitrontests/include/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/testsuites/tmitrontests/include/Makefile.am b/testsuites/tmitrontests/include/Makefile.am
deleted file mode 100644
index 43e177d584..0000000000
--- a/testsuites/tmitrontests/include/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## $Id$
-##
-
-noinst_HEADERS = timesys.h
-
-include $(top_srcdir)/../automake/local.am