summaryrefslogtreecommitdiffstats
path: root/cpukit/libcsupport
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-09 14:45:58 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-09 14:45:58 +0000
commit4056604fb714e3595f3150d961eb1ca66ce46e4c (patch)
tree03756068b470d6b5ef78296211e8d36516171fec /cpukit/libcsupport
parent2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-4056604fb714e3595f3150d961eb1ca66ce46e4c.tar.bz2
2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build libcsupport$(LIB_VARIANT).a instead of $(ARCH)/libcsupport.a.
Diffstat (limited to 'cpukit/libcsupport')
-rw-r--r--cpukit/libcsupport/ChangeLog5
-rw-r--r--cpukit/libcsupport/Makefile.am14
2 files changed, 12 insertions, 7 deletions
diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog
index 4709c4344a..8de47b8a0c 100644
--- a/cpukit/libcsupport/ChangeLog
+++ b/cpukit/libcsupport/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Build libcsupport$(LIB_VARIANT).a instead of
+ $(ARCH)/libcsupport.a.
+
2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build library using EXTRA_LIBRARIES and automake rules.
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 03c5bd7ff5..728ad75044 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -54,7 +54,7 @@ include_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \
include/zilog/z8536.h
## General stuff
-all-local: $(PREINSTALL_FILES) $(ARCH)/libcsupport.a
+all-local: $(PREINSTALL_FILES) libcsupport$(LIB_VARIANT).a
AM_CPPFLAGS += -I$(top_builddir)
@@ -121,13 +121,13 @@ endif
AM_CFLAGS += $(LIBC_DEFINES)
-EXTRA_LIBRARIES = o-optimize/libcsupport.a
-o_optimize_libcsupport_a_SOURCES = $(C_FILES)
-o_optimize_libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+EXTRA_LIBRARIES = libcsupport.a
+libcsupport_a_SOURCES = $(C_FILES)
+libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-EXTRA_LIBRARIES += o-debug/libcsupport.a
-o_debug_libcsupport_a_SOURCES = $(C_FILES)
-o_debug_libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+EXTRA_LIBRARIES += libcsupport_g.a
+libcsupport_g_a_SOURCES = $(C_FILES)
+libcsupport_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
DOC_FILES = src/TODO src/CASES