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

* configure.ac: Add AM_CONDITIONAL HAS_WRAPUP_LIBBSP.
	* wrapup/Makefile.am: Add AM_CONDITIONAL HAS_WRAPUP_LIBBSP.
This commit is contained in:
Ralf Corsepius
2004-01-27 01:38:49 +00:00
parent ae5544753a
commit 171a04c4df
3 changed files with 12 additions and 0 deletions

View File

@@ -1,3 +1,8 @@
2004-01-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add AM_CONDITIONAL HAS_WRAPUP_LIBBSP.
* wrapup/Makefile.am: Add AM_CONDITIONAL HAS_WRAPUP_LIBBSP.
2004-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ChangeLog: Merge-in libnetworking/ChangeLog.

View File

@@ -206,6 +206,8 @@ AM_CONDITIONAL([LIBCHIP],[test "$RTEMS_BSP_FAMILY" != "posix"])
# The bare bsp doesn't have libbsp.a
# FIXME: We should use a feature based check, here
AM_CONDITIONAL([HAS_LIBBSP],[test "$RTEMS_BSP_FAMILY" != "bare"])
AM_CONDITIONAL([HAS_WRAPUP_LIBBSP],
[test -f $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am])
AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"])
AM_CONDITIONAL(RPCTOOLS, test "$rpctools" != "no")

View File

@@ -12,8 +12,13 @@ project_lib_DATA = $(ARCH)/librtemsbsp$(LIB_VARIANT).a
SRCS = ../support/libsupport$(LIB_VARIANT).a
if HAS_LIBBSP
if HAS_WRAPUP_LIBBSP
SRCS += \
../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
else
SRCS += \
../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp$(LIB_VARIANT).a
endif
endif
if HAS_NETWORKING