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-26 05:09:01 +00:00
parent c5e9109f2e
commit c91605312d
9 changed files with 11 additions and 23 deletions
--- 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.
--- 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

--- 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
--- a/testsuites/tmitrontests/include/.cvsignore
+++ b/testsuites/tmitrontests/include/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/testsuites/tmitrontests/include/Makefile.am
+++ b/testsuites/tmitrontests/include/Makefile.am
@@ -1,7 +0,0 @@
-##
-##  $Id$
-##
-
-noinst_HEADERS = timesys.h
-
-include $(top_srcdir)/../automake/local.am
--- a/testsuites/tmtests/Makefile.am
+++ b/testsuites/tmtests/Makefile.am
@@ -4,7 +4,9 @@

 ACLOCAL_AMFLAGS = -I ../aclocal

-SUBDIRS = include tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 \
+noinst_HEADERS = include/timesys.h
+
+SUBDIRS = tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 \
    tm10 tm11 tm12 tm13 tm14 tm15 tm16 tm17 tm18 tm19 tm20 tm21 tm22 tm23 \
    tm24 tm25 tm26 tm27 tm28 tm29

--- a/testsuites/tmtests/configure.ac
+++ b/testsuites/tmtests/configure.ac
@@ -33,7 +33,6 @@ AC_SUBST(OPERATION_COUNT)

 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
-include/Makefile
 tmck/Makefile
 tmoverhd/Makefile
 tm01/Makefile
--- a/testsuites/tmtests/include/.cvsignore
+++ b/testsuites/tmtests/include/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/testsuites/tmtests/include/Makefile.am
+++ b/testsuites/tmtests/include/Makefile.am
@@ -1,7 +0,0 @@
-##
-##  $Id$
-##
-
-noinst_HEADERS = timesys.h
-
-include $(top_srcdir)/../automake/local.am