From 85a89337f6a869bb55bf8f7dfdc559c10aed3e8e Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 11 Aug 2002 02:59:39 +0000
Subject: 2002-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Add BSP_SUBDIRS.
	* Makefile.am: Use BSP_SUBDIRS to setup SUBDIRS.
---
 c/src/ChangeLog    |  5 +++++
 c/src/Makefile.am  |  2 +-
 c/src/configure.ac | 15 ++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'c/src')

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index b82fd96d0d..3015b8f11e 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Add BSP_SUBDIRS.
+	* Makefile.am: Use BSP_SUBDIRS to setup SUBDIRS.
+
 2002-08-10	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove AC_CONFIG_SUBDIR(wrapup).
diff --git a/c/src/Makefile.am b/c/src/Makefile.am
index 9a5d0eac1e..e03405decf 100644
--- a/c/src/Makefile.am
+++ b/c/src/Makefile.am
@@ -4,7 +4,7 @@
 
 ACLOCAL_AMFLAGS = -I ../../aclocal
 
-SUBDIRS = @exec@ @subdirs@ wrapup
+SUBDIRS = @BSP_SUBDIRS@
 
 clean-local:
 	$(RM) -r $(PROJECT_RELEASE)
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 0e515a6f2e..f384afa114 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -69,23 +69,30 @@ AS_IF([test x"$multilib" = x"no"],[
   RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],
   [--with-project-root="../../" --enable-rtemsbsp=$RTEMS_BSP
   ])
-  AC_SUBST([exec],[exec])
+  BSP_SUBDIRS="exec"
 ])
 
 ## Note: the order of the directories below is essential
 AC_CONFIG_SUBDIRS([make])
+BSP_SUBDIRS="$BSP_SUBDIRS make"
 AC_CONFIG_SUBDIRS([optman])
+BSP_SUBDIRS="$BSP_SUBDIRS optman"
 AC_CONFIG_SUBDIRS([lib/libcpu])
+BSP_SUBDIRS="$BSP_SUBDIRS lib/libcpu"
 AC_CONFIG_SUBDIRS([lib/libbsp])
+BSP_SUBDIRS="$BSP_SUBDIRS lib/libbsp"
 AC_CONFIG_SUBDIRS([libmisc])
+BSP_SUBDIRS="$BSP_SUBDIRS libmisc"
 
 AS_IF([test "$RTEMS_CPU" != "unix"],[
 ## HACK: Suppress libchip for unix
   AC_CONFIG_SUBDIRS([libchip])
+  BSP_SUBDIRS="$BSP_SUBDIRS libchip"
 ])
 
 AS_IF([test "$HAS_NETWORKING" = "yes"],[
   AC_CONFIG_SUBDIRS(libnetworking)
+  BSP_SUBDIRS="$BSP_SUBDIRS libnetworking"
   AS_IF([test "$RTEMS_HAS_RDBG" = "yes"],[
     RTEMS_CHECK_RDBG(RTEMS_BSP)
   ])
@@ -93,13 +100,19 @@ AS_IF([test "$HAS_NETWORKING" = "yes"],[
 
 AS_IF([test "$HAS_RDBG" = "yes"],[
   AC_CONFIG_SUBDIRS([librdbg])
+  BSP_SUBDIRS="$BSP_SUBDIRS librdbg"
 ])
 
 AS_IF([test "$RTEMS_HAS_CPLUSPLUS" = "yes"],[
   AC_CONFIG_SUBDIRS([librtems++])
+  BSP_SUBDIRS="$BSP_SUBDIRS librtems++"
 ])
 
+BSP_SUBDIRS="$BSP_SUBDIRS wrapup"
 AC_CONFIG_SUBDIRS([tests])
+BSP_SUBDIRS="$BSP_SUBDIRS tests"
+
+AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS])
 
 AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" )
 AM_CONDITIONAL(HAS_RDBG, test "$HAS_RDBG" = "yes" )
-- 
cgit v1.2.3