From d3eed3fd569dc65f1c21dff1410de434f2be01b6 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 9 Jan 2004 15:42:54 +0000 Subject: 2004-01-08 Ralf Corsepius * Makefile.am: Build librtems$(LIB_VARIANT).a instead of $(ARCH)/librtems.a. --- cpukit/rtems/ChangeLog | 5 +++++ cpukit/rtems/Makefile.am | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'cpukit/rtems') diff --git a/cpukit/rtems/ChangeLog b/cpukit/rtems/ChangeLog index 88dab9d97d..f343f45582 100644 --- a/cpukit/rtems/ChangeLog +++ b/cpukit/rtems/ChangeLog @@ -1,3 +1,8 @@ +2004-01-08 Ralf Corsepius + + * Makefile.am: Build librtems$(LIB_VARIANT).a instead of + $(ARCH)/librtems.a. + 2004-01-07 Ralf Corsepius * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index fcbd8c338b..f8c17f33e7 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -122,15 +122,15 @@ endif AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ -EXTRA_LIBRARIES = o-optimize/librtems.a -o_optimize_librtems_a_SOURCES = $(C_FILES) -o_optimize_librtems_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES = librtems.a +librtems_a_SOURCES = $(C_FILES) +librtems_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/librtems.a -o_debug_librtems_a_SOURCES = $(C_FILES) -o_debug_librtems_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += librtems_g.a +librtems_g_a_SOURCES = $(C_FILES) +librtems_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -all-local: $(PREINSTALL_FILES) $(ARCH)/librtems.a +all-local: $(PREINSTALL_FILES) librtems$(LIB_VARIANT).a EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES) -- cgit v1.2.3