diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-26 04:57:54 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-26 04:57:54 +0000 |
| commit | dc756092716132e9c7366d773a517f5628621cb8 (patch) | |
| tree | b08fdfc3f4a68279b8965cf11c1db39f3d2c7853 /testsuites | |
| parent | 2004-03-26 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-dc756092716132e9c7366d773a517f5628621cb8.tar.bz2 | |
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.
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/psxtests/ChangeLog | 6 | ||||
| -rw-r--r-- | testsuites/psxtests/Makefile.am | 6 | ||||
| -rw-r--r-- | testsuites/psxtests/configure.ac | 1 | ||||
| -rw-r--r-- | testsuites/psxtests/include/.cvsignore | 2 | ||||
| -rw-r--r-- | testsuites/psxtests/include/Makefile.am | 7 |
5 files changed, 8 insertions, 14 deletions
diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index ddf82f6dcf..19d993171f 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/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/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am index 15690ca154..c2a663c01d 100644 --- a/testsuites/psxtests/Makefile.am +++ b/testsuites/psxtests/Makefile.am @@ -4,16 +4,14 @@ ACLOCAL_AMFLAGS = -I ../aclocal -SHARED_DIRS = +noinst_HEADERS = include/pmacros.h POSIX_DIRS = include psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \ psx09 psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01 POSIX_FILES_DIRS = psxfile01 psxreaddir psxstat psxmount psx13 psxchroot01 -UNUSED_DIRS = - -SUBDIRS = $(SHARED_DIRS) $(POSIX_DIRS) $(POSIX_FILES_DIRS) $(UNUSED_DIRS) +SUBDIRS = $(POSIX_DIRS) $(POSIX_FILES_DIRS) EXTRA_DIST = psxtests.am diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac index b34bd3f94e..2647ce4225 100644 --- a/testsuites/psxtests/configure.ac +++ b/testsuites/psxtests/configure.ac @@ -29,7 +29,6 @@ AC_SUBST(BARE_CPU_MODEL) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -include/Makefile psx01/Makefile psx02/Makefile psx03/Makefile diff --git a/testsuites/psxtests/include/.cvsignore b/testsuites/psxtests/include/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/testsuites/psxtests/include/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/testsuites/psxtests/include/Makefile.am b/testsuites/psxtests/include/Makefile.am deleted file mode 100644 index 4899d0e63a..0000000000 --- a/testsuites/psxtests/include/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## -## $Id$ -## - -noinst_HEADERS = pmacros.h - -include $(top_srcdir)/../automake/local.am |