diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-09 15:48:45 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-09 15:48:45 +0000 |
| commit | f670eb767bc2dc8da9844fe6971363aa7f9dc58b (patch) | |
| tree | 73c595dfa0c0abd9fd4bab3b5ba4cc07eae61175 /cpukit/libfs | |
| parent | 2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-f670eb767bc2dc8da9844fe6971363aa7f9dc58b.tar.bz2 | |
2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build lib*$(LIB_VARIANT).a instead of
$(ARCH)/lib*.a.
Diffstat (limited to 'cpukit/libfs')
| -rw-r--r-- | cpukit/libfs/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libfs/Makefile.am | 29 |
2 files changed, 19 insertions, 15 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog index f7ce69d887..34996f0601 100644 --- a/cpukit/libfs/ChangeLog +++ b/cpukit/libfs/ChangeLog @@ -1,3 +1,8 @@ +2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Build lib*$(LIB_VARIANT).a instead of + $(ARCH)/lib*.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/libfs/Makefile.am b/cpukit/libfs/Makefile.am index 962e5d4fb9..9b3e6542d9 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -37,17 +37,17 @@ else libimfs_C_FILES = $(libimfs_EMBEDDED_C_FILES) endif -EXTRA_LIBRARIES = o-optimize/libimfs.a -o_optimize_libimfs_a_SOURCES = $(libimfs_C_FILES) -o_optimize_libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES = libimfs.a +libimfs_a_SOURCES = $(libimfs_C_FILES) +libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libimfs.a -o_debug_libimfs_a_SOURCES = $(libimfs_C_FILES) -o_debug_libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libimfs_g.a +libimfs_g_a_SOURCES = $(libimfs_C_FILES) +libimfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) include_HEADERS += src/imfs/imfs.h -IMFSLIB = $(ARCH)/libimfs.a +IMFSLIB = libimfs$(LIB_VARIANT).a # dosfs @@ -69,16 +69,15 @@ libdosfs_C_FILES = $(libdosfs_FATFS_C_FILES) $(libdosfs_DOSFS_C_FILES) include_HEADERS += src/dosfs/dosfs.h -DOSFSLIB = $(ARCH)/libdosfs.a +DOSFSLIB = libdosfs$(LIB_VARIANT).a -EXTRA_LIBRARIES += o-optimize/libdosfs.a -o_optimize_libdosfs_a_SOURCES = $(libdosfs_C_FILES) -o_optimize_libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) - -EXTRA_LIBRARIES += o-debug/libdosfs.a -o_debug_libdosfs_a_SOURCES = $(libdosfs_C_FILES) -o_debug_libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libdosfs.a +libdosfs_a_SOURCES = $(libdosfs_C_FILES) +libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libdosfs_g.a +libdosfs_g_a_SOURCES = $(libdosfs_C_FILES) +libdosfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) endif all-local: $(PREINSTALL_FILES) $(IMFSLIB) $(DOSFSLIB) |