diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-07 17:48:16 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-07 17:48:16 +0000 |
| commit | 07347cb5e79d1d651655e7975b69cb8a45243017 (patch) | |
| tree | 0150c1398a86acf7b5e77a557abd596b737b89fc /cpukit/libblock | |
| parent | 2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-07347cb5e79d1d651655e7975b69cb8a45243017.tar.bz2 | |
2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build library using EXTRA_LIBRARIES and automake rules.
Diffstat (limited to 'cpukit/libblock')
| -rw-r--r-- | cpukit/libblock/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/libblock/Makefile.am | 21 |
2 files changed, 13 insertions, 12 deletions
diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog index a69e1afdbc..7ede66bb30 100644 --- a/cpukit/libblock/ChangeLog +++ b/cpukit/libblock/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index d362a1469f..d134a60b63 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am include_rtemsdir = $(includedir)/rtems @@ -12,23 +11,21 @@ include_rtems_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \ include/rtems/diskdevs.h include/rtems/ramdisk.h \ include/rtems/ide_part_table.h -LIB = ${ARCH}/libblock.a - C_FILES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \ src/ide_part_table.c -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) +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 += o-debug/libblock.a +o_debug_libblock_a_SOURCES = $(C_FILES) +o_debug_libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += $(LIBC_DEFINES) -${ARCH}/%.$(OBJEXT): src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< - -$(LIB): ${OBJS} - $(make-library) - -all-local: $(PREINSTALL_FILES) $(LIB) +all-local: $(PREINSTALL_FILES) $(ARCH)/libblock.a PREINSTALL_FILES = |