From c91605312d65c78b0470a0b96c182035dbf8ad5e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 26 Mar 2004 05:09:01 +0000 Subject: 2004-03-26 Ralf Corsepius * include/Makefile.am: Remove. * Makefile.am: Merge-in include/Makefile.am. * configure.ac: Reflect changes above. --- testsuites/tmitrontests/ChangeLog | 6 ++++++ testsuites/tmitrontests/Makefile.am | 4 ++-- testsuites/tmitrontests/configure.ac | 1 - testsuites/tmitrontests/include/.cvsignore | 2 -- testsuites/tmitrontests/include/Makefile.am | 7 ------- testsuites/tmtests/Makefile.am | 4 +++- testsuites/tmtests/configure.ac | 1 - testsuites/tmtests/include/.cvsignore | 2 -- testsuites/tmtests/include/Makefile.am | 7 ------- 9 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 testsuites/tmitrontests/include/.cvsignore delete mode 100644 testsuites/tmitrontests/include/Makefile.am delete mode 100644 testsuites/tmtests/include/.cvsignore delete mode 100644 testsuites/tmtests/include/Makefile.am (limited to 'testsuites') 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 + + * include/Makefile.am: Remove. + * Makefile.am: Merge-in include/Makefile.am. + * configure.ac: Reflect changes above. + 2004-03-25 Ralf Corsepius * 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 diff --git a/testsuites/tmtests/Makefile.am b/testsuites/tmtests/Makefile.am index c09b08601f..d04b52f939 100644 --- 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 diff --git a/testsuites/tmtests/configure.ac b/testsuites/tmtests/configure.ac index 827f0166ae..571d47c2e6 100644 --- 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 diff --git a/testsuites/tmtests/include/.cvsignore b/testsuites/tmtests/include/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/testsuites/tmtests/include/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/testsuites/tmtests/include/Makefile.am b/testsuites/tmtests/include/Makefile.am deleted file mode 100644 index 43e177d584..0000000000 --- a/testsuites/tmtests/include/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## -## $Id$ -## - -noinst_HEADERS = timesys.h - -include $(top_srcdir)/../automake/local.am -- cgit v1.2.3