From 082972afe787c8c98e3a5aad1cb342fdf696341a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 15 Mar 2002 13:58:29 +0000 Subject: 2002-03-15 Ralf Corsepius * configure.ac: Special treatment of the bare BSP. Add RTEMS_BSP_ALIAS. Add HAS_LIBBSP. * Makefile.am: Append libbsp.a to SRC conditionally. --- c/src/wrapup/ChangeLog | 6 ++++++ c/src/wrapup/Makefile.am | 9 ++++++--- c/src/wrapup/configure.ac | 5 +++++ 3 files changed, 17 insertions(+), 3 deletions(-) (limited to 'c/src/wrapup') diff --git a/c/src/wrapup/ChangeLog b/c/src/wrapup/ChangeLog index a2298ec35a..540556c8af 100644 --- a/c/src/wrapup/ChangeLog +++ b/c/src/wrapup/ChangeLog @@ -1,3 +1,9 @@ +2002-03-15 Ralf Corsepius + + * configure.ac: Special treatment of the bare BSP. + Add RTEMS_BSP_ALIAS. Add HAS_LIBBSP. + * Makefile.am: Append libbsp.a to SRC conditionally. + 2002-02-28 Victor V. Vengerov * DOS filesystem including FAT12, FAT16, and FAT32 support submitted. diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index b554978059..ce7be0d2e3 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -4,7 +4,7 @@ ## build and install "glommed" librtemsbsp.a ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../aclocal include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg @@ -23,8 +23,11 @@ if HAS_RDBG LIBRDBG = $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a endif -SRCS = $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a -SRCS += $(LIBNETWORKING) $(LIBRDBG) \ +if HAS_LIBBSP +LIBBSP = $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a +endif + +SRCS = $(LIBBSP) $(LIBNETWORKING) $(LIBRDBG) \ $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a) \ diff --git a/c/src/wrapup/configure.ac b/c/src/wrapup/configure.ac index 453bb81e8a..633eabfc2d 100644 --- a/c/src/wrapup/configure.ac +++ b/c/src/wrapup/configure.ac @@ -21,6 +21,11 @@ RTEMS_ENABLE_MULTILIB RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_BSP_ALIAS(${RTEMS_BSP},bspalias) + +# The bare bsp doesn't have libbsp.a +# FIXME: We should use a feature based check, here +AM_CONDITIONAL(HAS_LIBBSP,[! test "$bspalias" = "bare"]) RTEMS_CHECK_NETWORKING(RTEMS_BSP) if test "$HAS_NETWORKING" = "yes"; then -- cgit v1.2.3