From 85107726ef303716f3e336f1ceb4f85fe75dd190 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Jul 2002 06:14:20 +0000 Subject: 2002-07-22 Ralf Corsepius * src/Makefile.am: Add bsplib_DATA. Eliminate LIBNAME. Cosmetical changes. --- c/src/librtems++/ChangeLog | 5 +++++ c/src/librtems++/src/Makefile.am | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog index c078fc1c40..293ca22843 100644 --- a/c/src/librtems++/ChangeLog +++ b/c/src/librtems++/ChangeLog @@ -1,3 +1,8 @@ +2002-07-22 Ralf Corsepius + + * src/Makefile.am: Add bsplib_DATA. Eliminate LIBNAME. Cosmetical + changes. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/c/src/librtems++/src/Makefile.am b/c/src/librtems++/src/Makefile.am index ace76eb21b..80829c3aa6 100644 --- a/c/src/librtems++/src/Makefile.am +++ b/c/src/librtems++/src/Makefile.am @@ -2,9 +2,11 @@ ## $Id$ ## +LIB = ${ARCH}/librtems++.a -LIBNAME = librtems++ -LIB = ${ARCH}/${LIBNAME}.a +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am +include $(top_srcdir)/../../../automake/lib.am CC_FILES = rtemsEvent.cc rtemsInterrupt.cc rtemsMessageQueue.cc \ rtemsSemaphore.cc rtemsStatusCode.cc rtemsTask.cc rtemsTimer.cc @@ -13,18 +15,16 @@ CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o) SRCS = $(CC_FILES) OBJS = $(CC_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - AM_CFLAGS += $(LIBC_DEFINES) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a + +bsplib_DATA = $(LIB) -$(LIB): ${OBJS} +$(LIB): $(OBJS) $(make-library) -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) +$(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -- cgit v1.2.3