2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* aclocal/rtems-top.m4: Don't AC_SUBST PROJECT_ROOT.
	Remove PROJECT_TOPdir (Unused).
	* aclocal/env-rtemscpu.m4: Remove PROJECT_RELEASE.
	Expand ${PROJECT_ROOT}.
	Remove RTEMS_ENABLE_BARE (Unused).
	Don't AC_SUBST RTEMS_BSP.
	* aclocal/enable-bare.m4: Remove (Unused).
This commit is contained in:
Ralf Corsepius
2004-01-11 12:21:40 +00:00
parent ca0eeaa6d7
commit c6e26e069c
4 changed files with 14 additions and 42 deletions
+10
View File
@@ -1,3 +1,13 @@
2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Don't AC_SUBST PROJECT_ROOT.
Remove PROJECT_TOPdir (Unused).
* aclocal/env-rtemscpu.m4: Remove PROJECT_RELEASE.
Expand ${PROJECT_ROOT}.
Remove RTEMS_ENABLE_BARE (Unused).
Don't AC_SUBST RTEMS_BSP.
* aclocal/enable-bare.m4: Remove (Unused).
2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Remove check for cpukit/aclocal/version.m4.
-19
View File
@@ -1,19 +0,0 @@
AC_DEFUN([RTEMS_ENABLE_BARE],
[
AC_ARG_ENABLE(bare-cpu-cflags,
AS_HELP_STRING(--enable-bare-cpu-cflags,specify a particular cpu cflag (bare bsp specific)),
[case "${enableval}" in
no) BARE_CPU_CFLAGS="" ;;
*) BARE_CPU_CFLAGS="${enableval}" ;;
esac],
[BARE_CPU_CFLAGS=""])
AC_ARG_ENABLE(bare-cpu-model,
AS_HELP_STRING(--enable-bare-cpu-model,specify a particular cpu model (bare bsp specific)),
[case "${enableval}" in
no) BARE_CPU_MODEL="" ;;
*) BARE_CPU_MODEL="${enableval}" ;;
esac],
[BARE_CPU_MODEL=""])
])
+4 -11
View File
@@ -14,9 +14,8 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
[MULTISUBDIR="/$with_multisubdir"])
AC_SUBST(MULTISUBDIR)
AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/lib/include"])
AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"])
AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)"])
AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}/lib/include"])
AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}/lib\$(MULTISUBDIR)"])
includedir="\${exec_prefix}/include"
libdir="${libdir}\$(MULTISUBDIR)"
@@ -38,18 +37,12 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
])
RTEMS_BSP="$rtems_cv_RTEMS_BSP"
AC_MSG_RESULT(${RTEMS_BSP})
AC_SUBST(RTEMS_BSP)
includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"])
AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib"])
AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)/$RTEMS_BSP"])
RTEMS_ENABLE_BARE
AC_SUBST(BARE_CPU_MODEL)
AC_SUBST(BARE_CPU_CFLAGS)
AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}/$RTEMS_BSP/lib/include"])
AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}/$RTEMS_BSP/lib"])
])
AC_SUBST([project_libdir],["\$(libdir)"])
-12
View File
@@ -23,19 +23,7 @@ AC_SUBST(RTEMS_TOPdir)
## with_target_subdirs is handled implicitly by autoconf
test -n "$with_target_subdir" || with_target_subdir="."
if test "$with_target_subdir" = "." ; then
# Native
PROJECT_TOPdir="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
else
# Cross
dots=`echo $with_target_subdir|\
sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
PROJECT_TOPdir="${dots}${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
fi
AC_SUBST(PROJECT_TOPdir)
PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
AC_SUBST(PROJECT_ROOT)
AC_MSG_CHECKING([for RTEMS Version])
AC_MSG_RESULT([_RTEMS_VERSION])