From 39fa3ed0fe9a75a754159e9b7ded6710abd9a602 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 15 Jan 2003 18:12:16 +0000 Subject: 2002-01-15 Ralf Corsepius * m68040/fpsp/Makefile.am: Don't include @RTEMS_BSP@.cfg. Eliminate *_O_FILES. * shared/cache/Makefile.am: Ditto. * shared/misc/Makefile.am: Ditto. --- c/src/lib/libcpu/m68k/ChangeLog | 7 +++++++ c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am | 7 ++----- c/src/lib/libcpu/m68k/shared/cache/Makefile.am | 6 +----- c/src/lib/libcpu/m68k/shared/misc/Makefile.am | 5 +---- 4 files changed, 11 insertions(+), 14 deletions(-) (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog index 7fe325f561..999de5c4af 100644 --- a/c/src/lib/libcpu/m68k/ChangeLog +++ b/c/src/lib/libcpu/m68k/ChangeLog @@ -1,3 +1,10 @@ +2002-01-15 Ralf Corsepius + + * m68040/fpsp/Makefile.am: Don't include @RTEMS_BSP@.cfg. + Eliminate *_O_FILES. + * shared/cache/Makefile.am: Ditto. + * shared/misc/Makefile.am: Ditto. + 2002-12-06 Ralf Corsepius * configure.ac: Remove RTEMS_CHECK_BSP_CACHE. diff --git a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am index d35a6a32b3..5f421270f2 100644 --- a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am +++ b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am @@ -5,12 +5,11 @@ PGM = $(ARCH)/fpsp.rel -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am C_FILES = rtems_fpsp.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = fpsp.defs @@ -20,9 +19,7 @@ S_FILES = bindec.S binstr.S bugfix.S decbin.S do_func.S gen_except.S \ smovecr.S srem_mod.S ssin.S ssinh.S stan.S stanh.S sto_res.S stwotox.S \ tbldo.S util.S x_bsun.S x_fline.S x_operr.S x_ovfl.S x_snan.S x_store.S \ x_unfl.S x_unimp.S x_unsupp.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) $(S_O_FILES) +OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) # # (OPTIONAL) Add local stuff here using += diff --git a/c/src/lib/libcpu/m68k/shared/cache/Makefile.am b/c/src/lib/libcpu/m68k/shared/cache/Makefile.am index 4d0513a490..827aa3e26e 100644 --- a/c/src/lib/libcpu/m68k/shared/cache/Makefile.am +++ b/c/src/lib/libcpu/m68k/shared/cache/Makefile.am @@ -2,20 +2,16 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared/src C_FILES = cache.c cache_aligned_malloc.c cache_manager.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_libcpudir = $(includedir)/libcpu noinst_HEADERS = cache_.h include_libcpu_HEADERS = cache.h -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am diff --git a/c/src/lib/libcpu/m68k/shared/misc/Makefile.am b/c/src/lib/libcpu/m68k/shared/misc/Makefile.am index c11507e5fa..d6b5a433f9 100644 --- a/c/src/lib/libcpu/m68k/shared/misc/Makefile.am +++ b/c/src/lib/libcpu/m68k/shared/misc/Makefile.am @@ -4,11 +4,8 @@ C_FILES = memcpy.c m68kidle.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am -- cgit v1.2.3