RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-05-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2003-05-02 20:29:10 +00:00
parent 401ae9c017
commit 1e030c49da
4 changed files with 61 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cpukit/ChangeLog
View File

@@ -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.

16
cpukit/aclocal/enable-rtemsbsp.m4
View File

@@ -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=""])
])

41
cpukit/aclocal/env-rtemsbsp.m4
View File

@@ -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"
])

67
cpukit/aclocal/env-rtemscpu.m4
View File

@@ -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"])
])