diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-09 14:45:38 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-09 14:45:38 +0000 |
| commit | dfd7c2553a63f3d9b745c8b8add14bb9f3a429c2 (patch) | |
| tree | 9024f0da7fecbbe90eb8697abb898a2f69670090 /cpukit | |
| parent | 2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-dfd7c2553a63f3d9b745c8b8add14bb9f3a429c2.tar.bz2 | |
2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build libblock$(LIB_VARIANT).a instead of
$(ARCH)/libblock.a.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/libblock/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libblock/Makefile.am | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog index 7ede66bb30..35fb88d277 100644 --- a/cpukit/libblock/ChangeLog +++ b/cpukit/libblock/ChangeLog @@ -1,3 +1,8 @@ +2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Build libblock$(LIB_VARIANT).a instead of + $(ARCH)/libblock.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/libblock/Makefile.am b/cpukit/libblock/Makefile.am index d134a60b63..87268630df 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -14,18 +14,18 @@ include_rtems_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \ C_FILES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \ src/ide_part_table.c -EXTRA_LIBRARIES = o-optimize/libblock.a -o_optimize_libblock_a_SOURCES = $(C_FILES) -o_optimize_libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES = libblock.a +libblock_a_SOURCES = $(C_FILES) +libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libblock.a -o_debug_libblock_a_SOURCES = $(C_FILES) -o_debug_libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libblock_g.a +libblock_g_a_SOURCES = $(C_FILES) +libblock_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += $(LIBC_DEFINES) -all-local: $(PREINSTALL_FILES) $(ARCH)/libblock.a +all-local: $(PREINSTALL_FILES) libblock$(LIB_VARIANT).a PREINSTALL_FILES = |