Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-22 08:54:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* aclocal/rtems-top.m4: Don't AC_SUBST(PROJECT_ROOT).
	Add project_libdir, project_include and libdir.
	* aclocal/env-rtemscpu.m4: Remove all references to RTEMS_BSP.
	Remove project_libdir, project_include and libdir.
	Unconditionally use CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V.
This commit is contained in:
Ralf Corsepius
2004-03-30 15:19:48 +00:00
parent ddeb76938c
commit 6855663657
3 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/ChangeLog
+8
View File
@@ -1,3 +1,11 @@
2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>
* aclocal/rtems-top.m4: Don't AC_SUBST(PROJECT_ROOT).
Add project_libdir, project_include and libdir.
* aclocal/env-rtemscpu.m4: Remove all references to RTEMS_BSP.
Remove project_libdir, project_include and libdir.
Unconditionally use CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V.
2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org>
* libnetworking/lib/ftpfs.c, libnetworking/lib/rtems_bsdnet_ntp.c,
cpukit/aclocal/env-rtemscpu.m4
+5 -30
View File
@@ -1,39 +1,14 @@
dnl $Id$
# PROJECT_ROOT .. Directory to put the temporary installed files into
# FIXME: to be revisited - featureladden, bloated
AC_DEFUN([RTEMS_ENV_RTEMSCPU],
[
AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
AS_IF([test -n "$enable_rtemsbsp"],
[ # Per BSP
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_MSG_CHECKING([for RTEMS_BSP])
AC_CACHE_VAL(rtems_cv_RTEMS_BSP,[
test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$enable_rtemsbsp"
])
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})
includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
],[
includedir="\${exec_prefix}/include"
libdir="${libdir}\$(MULTISUBDIR)"
])
AC_SUBST([project_libdir],["\$(libdir)"])
AC_SUBST([project_includedir],["\$(includedir)"])
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])
AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
])
cpukit/aclocal/rtems-top.m4
+5 -1
View File
@@ -57,10 +57,14 @@ AS_IF([test "$enable_multilib" = "yes"],[
PROJECT_ROOT='$(top_builddir)'${rtems_updir}'../$(MULTIBUILDTOP)'],[
PROJECT_ROOT='$(top_builddir)'${rtems_updir}])
])
AC_SUBST([PROJECT_ROOT])
AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"])
AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}lib\$(MULTISUBDIR)"])
libdir="${libdir}\$(MULTISUBDIR)"
AC_SUBST([project_libdir],["\$(libdir)"])
AC_SUBST([project_includedir],["\$(includedir)"])
AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
])dnl