summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-05-02 20:29:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-05-02 20:29:10 +0000
commit1e030c49daefcdb4b0785a4ff077a277a5a7ff3b (patch)
tree4c48c509a6f7244c3e657d9ba39f661399112d64
parent401ae9c017a16bc50d697527a8ea60ab2c9ee749 (diff)
downloadrtems-1e030c49daefcdb4b0785a4ff077a277a5a7ff3b.tar.bz2
2003-05-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemscpu.m4: Merge-in env-rtemsbsp.m4. * aclocal/env-rtemsbsp.m4: Remove. * aclocal/enable-rtemsbsp.m4: Remove. 2003-05-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * aclocal/env-rtemscpu.m4: Remove stray '/' in setting up project_libdir.
-rw-r--r--cpukit/ChangeLog11
-rw-r--r--cpukit/aclocal/enable-rtemsbsp.m416
-rw-r--r--cpukit/aclocal/env-rtemsbsp.m441
-rw-r--r--cpukit/aclocal/env-rtemscpu.m467
4 files changed, 61 insertions, 74 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 23fa5f4335..c6eadbe7af 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/env-rtemscpu.m4: Merge-in env-rtemsbsp.m4.
+ * aclocal/env-rtemsbsp.m4: Remove.
+ * aclocal/enable-rtemsbsp.m4: Remove.
+
+2003-05-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/env-rtemscpu.m4: Remove stray '/' in setting up
+ project_libdir.
+
2003-04-17 Joel Sherrill <joel@OARcorp.com>
* aclocal/version.m4: Updated to rtems-ss-20030417.
diff --git a/cpukit/aclocal/enable-rtemsbsp.m4 b/cpukit/aclocal/enable-rtemsbsp.m4
deleted file mode 100644
index a4c2114e59..0000000000
--- a/cpukit/aclocal/enable-rtemsbsp.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-dnl $Id$
-
-dnl Override the set of BSPs to be built.
-dnl used by the toplevel configure script
-dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list)
-AC_DEFUN(RTEMS_ENABLE_RTEMSBSP,
-[
-AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])dnl
-AC_ARG_ENABLE(rtemsbsp,
-AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."],
-[BSPs to include in build]),
-[case "${enableval}" in
- yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp=\"bsp1 bsp2\"]);;
- *) $1=$enableval;;
-esac],[$1=""])
-])
diff --git a/cpukit/aclocal/env-rtemsbsp.m4 b/cpukit/aclocal/env-rtemsbsp.m4
deleted file mode 100644
index 531af6e881..0000000000
--- a/cpukit/aclocal/env-rtemsbsp.m4
+++ /dev/null
@@ -1,41 +0,0 @@
-dnl $Id$
-
-dnl Pass a single BSP via an environment variable
-dnl used by per BSP configure scripts
-AC_DEFUN(RTEMS_ENV_RTEMSBSP,
-[dnl
-AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
-
-AC_ARG_VAR([CPU_CFLAGS],[])
-AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[])
-AC_ARG_VAR([CFLAGS_DEBUG_V],[])
-AC_ARG_VAR([CFLAGS_PROFILE_V],[])
-
-AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
-AC_MSG_CHECKING([for RTEMS_BSP])
-AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
-[dnl
- test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP";
-])dnl
-if test -z "$rtems_cv_RTEMS_BSP"; then
- AC_MSG_ERROR([Missing RTEMS_BSP])
-fi
-RTEMS_BSP="$rtems_cv_RTEMS_BSP"
-AC_MSG_RESULT(${RTEMS_BSP})
-AC_SUBST(RTEMS_BSP)
-
-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
-project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"
-AC_SUBST(project_libdir)
-
-RTEMS_ENABLE_BARE
-AC_SUBST(BARE_CPU_MODEL)
-AC_SUBST(BARE_CPU_CFLAGS)
-
-AM_CONDITIONAL([MULTILIB],[false])
-
-includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
-libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
-])
diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4
index c6635aa611..4a1525739c 100644
--- a/cpukit/aclocal/env-rtemscpu.m4
+++ b/cpukit/aclocal/env-rtemscpu.m4
@@ -1,26 +1,59 @@
dnl $Id$
AC_DEFUN(RTEMS_ENV_RTEMSCPU,
-[AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
+[
+ AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
-if test x"$multilib" = x"yes"; then
- AS_IF([test -n "$with_multisubdir"],
- [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
- AC_SUBST(MULTIBUILDTOP)
+ AS_IF([test x"$multilib" = x"yes"],
+ [
+ AS_IF([test -n "$with_multisubdir"],
+ [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
+ AC_SUBST(MULTIBUILDTOP)
+
+ AS_IF([test -n "$with_multisubdir"],
+ [MULTISUBDIR="/$with_multisubdir"])
+ AC_SUBST(MULTISUBDIR)
+
+ PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
+ project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"
+
+ includedir="\${exec_prefix}/lib/include"
+ libdir="${libdir}\$(MULTISUBDIR)"
+ ],
+ [
+ AC_ARG_VAR([CPU_CFLAGS],[])
+ AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
+ [CFLAGS for building the optimized variant])
+ AC_ARG_VAR([CFLAGS_DEBUG_V],
+ [CFLAGS for building the debugging variant])
+ AC_ARG_VAR([CFLAGS_PROFILE_V],
+ [CFLAGS for building the profiled variant])
+
+ AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
+ AC_MSG_CHECKING([for RTEMS_BSP])
+ AC_CACHE_VAL(rtems_cv_RTEMS_BSP,[
+ test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP"
+ ])
+ AS_IF([test -z "$rtems_cv_RTEMS_BSP"],[
+ AC_MSG_ERROR([Missing RTEMS_BSP])
+ ])
+ RTEMS_BSP="$rtems_cv_RTEMS_BSP"
+ AC_MSG_RESULT(${RTEMS_BSP})
+ AC_SUBST(RTEMS_BSP)
+
+ PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
+ project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"
- AS_IF([test -n "$with_multisubdir"],
- [MULTISUBDIR="/$with_multisubdir"])
- AC_SUBST(MULTISUBDIR)
+ includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
+ libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
- PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
- AC_SUBST(PROJECT_INCLUDE)
+ RTEMS_ENABLE_BARE
+ AC_SUBST(BARE_CPU_MODEL)
+ AC_SUBST(BARE_CPU_CFLAGS)
+ ])
- project_libdir="\$(PROJECT_ROOT)/lib/\$(MULTISUBDIR)"
AC_SUBST(project_libdir)
-
- includedir="\${exec_prefix}/lib/include"
- libdir="${libdir}\$(MULTISUBDIR)"
-else
- RTEMS_ENV_RTEMSBSP
-fi
+ AC_SUBST(PROJECT_INCLUDE)
+
+ AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
])