diff options
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/configure.ac | 2 | ||||
| -rw-r--r-- | c/src/wrapup/Makefile.am | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index e73cd42dbd..1e4fee2e94 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -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. diff --git a/c/src/configure.ac b/c/src/configure.ac index 6caa30e5ec..99f0b1b62e 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -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") diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index ab5050089a..87b0a764a4 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -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 |