diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-08-08 03:24:13 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-08-08 03:24:13 +0000 |
| commit | dd984c024c02fe9639bd629fa870ca05b9ccd664 (patch) | |
| tree | e0f613a8d1ff96b6be7347a022d5cc5889282387 | |
| parent | 2003-08-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-dd984c024c02fe9639bd629fa870ca05b9ccd664.tar.bz2 | |
2003-08-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Merge-in lib/libcpu/configure.ac.
Merge-in lib/libbsp/configure.ac.
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/configure.ac | 35 |
2 files changed, 35 insertions, 5 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index a2a65d30ee..a4470912ce 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2003-08-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Merge-in lib/libcpu/configure.ac. + Merge-in lib/libbsp/configure.ac. + 2003-07-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Use relative dir to make/${RTEMS_BSP}.cache. diff --git a/c/src/configure.ac b/c/src/configure.ac index 4c31179cdd..d8c76a1170 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -119,14 +119,32 @@ AS_IF([test x"$multilib" = x"no"],[ AC_CONFIG_SUBDIRS([make]) BSP_SUBDIRS="$BSP_SUBDIRS make" 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" + +RTEMS_CPU_SUBDIRS(lib/libcpu) +if test -d "lib/libcpu/${RTEMS_CPU}"; then + libcpu_cpu_subdir="${RTEMS_CPU}" + BSP_SUBDIRS="$BSP_SUBDIRS lib/libcpu/${RTEMS_CPU}" +else + libcpu_cpu_subdir= +fi +AC_SUBST(libcpu_cpu_subdir) + +# Is there code where there should be for this BSP? +# The bare bsp is a special case as it is not under the RTEMS_CPU path +if test "$RTEMS_BSP_FAMILY" = "bare" ; then + AC_CONFIG_SUBDIRS([lib/libbsp/bare]) + BSP_SUBDIRS="$BSP_SUBDIRS lib/libbsp/bare" + AC_SUBST(libbsp_cpu_subdir,bare) +else + RTEMS_CPU_SUBDIRS([lib/libbsp]) + BSP_SUBDIRS="$BSP_SUBDIRS lib/libbsp/${RTEMS_CPU}" + AC_SUBST(libbsp_cpu_subdir,$RTEMS_CPU) +fi + BSP_SUBDIRS="$BSP_SUBDIRS libchip" BSP_SUBDIRS="$BSP_SUBDIRS libnetworking" BSP_SUBDIRS="$BSP_SUBDIRS librdbg" - + AS_IF([test "$RTEMS_HAS_CPLUSPLUS" = "yes"],[ AC_CONFIG_SUBDIRS([librtems++]) BSP_SUBDIRS="$BSP_SUBDIRS librtems++" @@ -163,6 +181,7 @@ AS_IF([test "$host_cpu" = "sparc"],[ AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"]) AM_CONDITIONAL([HAS_RDBG],[test "$HAS_RDBG" = "yes"]) AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes") +AM_CONDITIONAL([HAS_MP],[test "$HAS_MP" = "yes"]) # The posix bsp doesn't support libchip # FIXME: We should use a feature based check, here @@ -215,6 +234,12 @@ libchip/ide/Makefile optman/Makefile +lib/libcpu/Makefile + +lib/libbsp/Makefile +lib/libbsp/shmdr/Makefile +lib/libbsp/shared/Makefile + wrapup/Makefile ]) |