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/score | |
| 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/score')
| -rw-r--r-- | cpukit/score/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/score/Makefile.am | 22 |
2 files changed, 12 insertions, 14 deletions
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog index 80e98014ba..e89019c76f 100644 --- a/cpukit/score/ChangeLog +++ b/cpukit/score/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-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> PR 533/bsps diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index d09c020ce5..32e7d7c743 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/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 SUBDIRS = . cpu @@ -81,8 +80,6 @@ EXTRA_DIST = macros/README ## src -LIB=$(ARCH)/libscore.a - # We only build multiprocessing related files if HAS_MP was defined MP_C_FILES = src/mpci.c src/objectmp.c src/threadmp.c @@ -146,23 +143,20 @@ C_FILES = $(STD_C_FILES) if HAS_MP C_FILES += $(MP_C_FILES) endif -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) - -# -# Add local stuff here using += -# AM_CPPFLAGS += -D__RTEMS_INSIDE__ -$(LIB): ${OBJS} - $(make-library) +EXTRA_LIBRARIES = o-optimize/libscore.a +o_optimize_libscore_a_SOURCES = $(C_FILES) +o_optimize_libscore_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -${ARCH}/%.$(OBJEXT): src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< +EXTRA_LIBRARIES += o-debug/libscore.a +o_debug_libscore_a_SOURCES = $(C_FILES) +o_debug_libscore_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt -all-local: $(PREINSTALL_FILES) $(LIB) +all-local: $(PREINSTALL_FILES) $(ARCH)/libscore.a PREINSTALL_FILES = |