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.
2025-12-27 06:58:19 +00:00 · 2004-03-26 04:57:54 +00:00
parent ef02bc1828
commit dc75609271
5 changed files with 8 additions and 14 deletions
--- 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.
--- 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

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