From a5f8ec565d246a2fb16fe0c8779543bf79f5284d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 16 Jan 2003 02:51:44 +0000 Subject: 2003-01-15 Ralf Corsepius * tx39/vectorisrs/Makefile.am: Don't include @RTEMS_BSP@.cfg. * r46xx/vectorisrs/Makefile.am: Ditto. * mongoosev/vectorisrs/Makefile.am: Ditto. * mongoosev/duart/Makefile.am: Ditto. * shared/interrupts/Makefile.am: Ditto. * shared/cache/Makefile.am: Ditto. Eliminate *_O_FILES. --- c/src/lib/libcpu/mips/ChangeLog | 9 +++++++++ c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am | 3 +-- c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am | 3 +-- c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am | 3 +-- c/src/lib/libcpu/mips/shared/cache/Makefile.am | 5 +---- c/src/lib/libcpu/mips/shared/interrupts/Makefile.am | 1 - c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am | 3 +-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog index bdb75d6aa3..18cadaa0c6 100644 --- a/c/src/lib/libcpu/mips/ChangeLog +++ b/c/src/lib/libcpu/mips/ChangeLog @@ -1,3 +1,12 @@ +2003-01-15 Ralf Corsepius + + * tx39/vectorisrs/Makefile.am: Don't include @RTEMS_BSP@.cfg. + * r46xx/vectorisrs/Makefile.am: Ditto. + * mongoosev/vectorisrs/Makefile.am: Ditto. + * mongoosev/duart/Makefile.am: Ditto. + * shared/interrupts/Makefile.am: Ditto. + * shared/cache/Makefile.am: Ditto. Eliminate *_O_FILES. + 2002-12-14 Ralf Corsepius * timer/Makefile.am: Don't include @RTEMS_BSP@.cfg. diff --git a/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am index a23d0743d1..08baf6696a 100644 --- a/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am +++ b/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am @@ -7,9 +7,8 @@ PGM = $(ARCH)/mg5uart.rel C_FILES = mg5uart.c mg5uart_reg.c -mg5uart_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +mg5uart_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -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/mips/mongoosev/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am index feaee73411..5205991174 100644 --- a/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am +++ b/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am @@ -7,9 +7,8 @@ PGM = $(ARCH)/vectorisrs.rel C_FILES = maxvectors.c vectorisrs.c -vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -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/mips/r46xx/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am index feaee73411..5205991174 100644 --- a/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am +++ b/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am @@ -7,9 +7,8 @@ PGM = $(ARCH)/vectorisrs.rel C_FILES = maxvectors.c vectorisrs.c -vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -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/mips/shared/cache/Makefile.am b/c/src/lib/libcpu/mips/shared/cache/Makefile.am index 4d0513a490..d052e4280d 100644 --- a/c/src/lib/libcpu/mips/shared/cache/Makefile.am +++ b/c/src/lib/libcpu/mips/shared/cache/Makefile.am @@ -6,16 +6,13 @@ 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/mips/shared/interrupts/Makefile.am b/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am index ccc9cac64f..a10c9bb36f 100644 --- a/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am +++ b/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am @@ -11,7 +11,6 @@ S_FILES = isr_entries.S interrupts_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) -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/mips/tx39/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am index feaee73411..5205991174 100644 --- a/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am +++ b/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am @@ -7,9 +7,8 @@ PGM = $(ARCH)/vectorisrs.rel C_FILES = maxvectors.c vectorisrs.c -vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am -- cgit v1.2.3