From f87a9f25587a5d34c7aab0f895980262c1ccdf62 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 6 Mar 2003 06:01:31 +0000 Subject: [PATCH] 2003-03-04 Ralf Corsepius * configure.ac: Add support/. * support/Makefile.am: New. * support/version.c: New. * wrapup/Makefile.am: Add support/libsupport.a. --- c/src/ChangeLog | 7 +++++++ c/src/configure.ac | 3 ++- c/src/support/Makefile.am | 20 ++++++++++++++++++++ c/src/support/version.c | 28 ++++++++++++++++++++++++++++ c/src/wrapup/Makefile.am | 2 +- 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 c/src/support/Makefile.am create mode 100644 c/src/support/version.c diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 62f53181ad..6873bb20cc 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,10 @@ +2003-03-04 Ralf Corsepius + + * configure.ac: Add support/. + * support/Makefile.am: New. + * support/version.c: New. + * wrapup/Makefile.am: Add support/libsupport.a. + 2003-03-04 Ralf Corsepius * wrapup/Makefile.am: Use SRC += instead of make-vars. diff --git a/c/src/configure.ac b/c/src/configure.ac index 69b1b53cf3..7e935a658f 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -148,6 +148,7 @@ AS_IF([test "$RTEMS_HAS_CPLUSPLUS" = "yes"],[ BSP_SUBDIRS="$BSP_SUBDIRS librtems++" ]) +BSP_SUBDIRS="$BSP_SUBDIRS support" BSP_SUBDIRS="$BSP_SUBDIRS wrapup" AC_ARG_ENABLE([ada], @@ -190,6 +191,6 @@ AC_CONFIG_FILES([Makefile], [RTEMS_BSP=${RTEMS_BSP} MAKE=${MAKE}]) -AC_CONFIG_FILES([wrapup/Makefile]) +AC_CONFIG_FILES([support/Makefile wrapup/Makefile]) AC_OUTPUT diff --git a/c/src/support/Makefile.am b/c/src/support/Makefile.am new file mode 100644 index 0000000000..9c528fc254 --- /dev/null +++ b/c/src/support/Makefile.am @@ -0,0 +1,20 @@ +## +## $Id$ +## + +include $(top_srcdir)/../../automake/compile.am +include $(top_srcdir)/../../automake/lib.am + +AM_CPPFLAGS += -DRTEMS_BSP=\"$(RTEMS_BSP)\" + +C_FILES=version.c +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) + +LIB = $(ARCH)/libsupport.a + +$(LIB): $(OBJS) + $(make-library) + +all-local: $(ARCH) $(LIB) + +include $(top_srcdir)/../../automake/local.am diff --git a/c/src/support/version.c b/c/src/support/version.c new file mode 100644 index 0000000000..27812b29d3 --- /dev/null +++ b/c/src/support/version.c @@ -0,0 +1,28 @@ +/* + * COPYRIGHT (c) 2003, Ralf Corsepius, Ulm, Germany. + * COPYRIGHT (c) 2003, On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ + */ + +#include + +#ifndef RTEMS_VERSION +#error "Missing RTEMS_VERSION" +#endif +#ifndef CPU_NAME +#error "Missing CPU_NAME" +#endif +#ifndef CPU_MODEL_NAME +#error "Missing CPU_MODEL_NAME" +#endif +#ifndef RTEMS_BSP +#error "Missing RTEMS_BSP" +#endif + +const char _RTEMS_version[] = + RTEMS_VERSION "(" CPU_NAME "/" CPU_MODEL_NAME "/" RTEMS_BSP ")"; diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index a95ea2b4be..d31d31e676 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -9,7 +9,7 @@ include $(top_srcdir)/../../automake/lib.am LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a -SRCS = +SRCS = ../support/${ARCH}/libsupport.a if HAS_LIBBSP SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a