From 68556636579a3e2403c8588d0f61bd1ff0a60c95 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 30 Mar 2004 15:19:48 +0000
Subject: 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.
---
 cpukit/ChangeLog               |  8 ++++++++
 cpukit/aclocal/env-rtemscpu.m4 | 35 +++++------------------------------
 cpukit/aclocal/rtems-top.m4    |  6 +++++-
 3 files changed, 18 insertions(+), 31 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index bf96cbca51..bdc56786b9 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -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,
diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4
index 2607e78514..eee3c5dd5f 100644
--- a/cpukit/aclocal/env-rtemscpu.m4
+++ b/cpukit/aclocal/env-rtemscpu.m4
@@ -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"])
 ])
diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4
index 6d6f6fabc5..c3f74304e5 100644
--- a/cpukit/aclocal/rtems-top.m4
+++ b/cpukit/aclocal/rtems-top.m4
@@ -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
-- 
cgit v1.2.3