2004-03-25 Ralf Corsepius <ralf_corsepius@rtems.org>

* configure.ac: Add 2nd arg to RTEMS_TOP.
	Unconditionally configure MP-directories.
	* Makefile.am: Don't include @RTEMS_BSP@.cfg.
	Add DIST_SUBDIRS comprising MP-subdirs.
	* samples/Makefile.am: Add DIST_SUBDIRS comprising MP-subdirs.
This commit is contained in:
Ralf Corsepius
2004-03-25 05:19:36 +00:00
parent e1908de1f5
commit a1cf46b328
4 changed files with 12 additions and 10 deletions

View File

@@ -1,3 +1,11 @@
2004-03-25 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Add 2nd arg to RTEMS_TOP.
Unconditionally configure MP-directories.
* Makefile.am: Don't include @RTEMS_BSP@.cfg.
Add DIST_SUBDIRS comprising MP-subdirs.
* samples/Makefile.am: Add DIST_SUBDIRS comprising MP-subdirs.
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Require automake >= 1.8, autoconf >= 2.59.

View File

@@ -2,15 +2,15 @@
ACLOCAL_AMFLAGS = -I aclocal -I ../../../testsuites/aclocal
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../testsuites/automake/compile.am
SUBDIRS = support samples sptests tmtests
if HAS_MP
SUBDIRS += mptests
endif
DIST_SUBDIRS = support samples sptests tmtests mptests
EXTRA_DIST = ada.am
include $(top_srcdir)/../../../testsuites/automake/subdirs.am

View File

@@ -5,7 +5,7 @@
AC_PREREQ(2.59)
AC_INIT([rtems-ada-tests],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
AC_CONFIG_SRCDIR([support])
RTEMS_TOP(../../..)
RTEMS_TOP([../../..],[])
RTEMS_CANONICAL_TARGET_CPU
@@ -46,15 +46,10 @@ samples/Makefile
samples/base_sp/Makefile
samples/hello/Makefile
samples/ticker/Makefile
])
if test "$HAS_MP" = "yes"; then
AC_CONFIG_FILES([
samples/base_mp/Makefile
samples/base_mp/node1/Makefile
samples/base_mp/node2/Makefile
])
fi
AC_CONFIG_FILES([
sptests/Makefile
@@ -117,7 +112,6 @@ tmtests/tmck/Makefile
tmtests/tmoverhd/Makefile
])
if test "$HAS_MP" = "yes"; then
AC_CONFIG_FILES([
mptests/Makefile
mptests/mp01/Makefile
@@ -137,6 +131,5 @@ mptests/mp01/node2/Makefile
#mptests/mp12/Makefile
#mptests/mp13/Makefile
#mptests/mp14/Makefile
fi
AC_OUTPUT

View File

@@ -5,6 +5,7 @@ SUBDIRS = hello ticker base_sp
if HAS_MP
SUBDIRS += base_mp
endif
DIST_SUBDIRS = hello ticker base_sp base_mp
include $(top_srcdir)/../../../testsuites/automake/subdirs.am
include $(top_srcdir)/../../../testsuites/automake/local.am