summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-16 13:17:15 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-16 13:17:15 +0000
commit1ba50857e6d238e666549c486d1f68ad8f95bb26 (patch)
tree583afb07d99c52662457baab13b8aa65e891838d
parent2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-1ba50857e6d238e666549c486d1f68ad8f95bb26.tar.bz2
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mongoosev/duart/Makefile.am: Remove. * mongoosev/vectorisrs/Makefile.am: Remove. * mongoosev/Makefile.am: Merge-in vectorisrs/Makefile.am, duart/Makefile.am. * r46xx/vectorisrs/Makefile.am: Remove. * r46xx/Makefile.am: Merge-in vectorisrs/Makefile.am. * shared/cache/Makefile.am: Remove. * shared/interrupts/Makefile.am: Remove. * shared/Makefile.am: Merge-in cache/Makefile.am, interrupts/Makefile.am. * tx39/vectorisrs/Makefile.am: Remove. * tx39/Makefile.am: Merge-in vectorisrs/Makefile.am. * configure.ac: Reflect changes above.
-rw-r--r--c/src/lib/libcpu/mips/ChangeLog16
-rw-r--r--c/src/lib/libcpu/mips/configure.ac6
-rw-r--r--c/src/lib/libcpu/mips/mongoosev/Makefile.am56
-rw-r--r--c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am40
-rw-r--r--c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am27
-rw-r--r--c/src/lib/libcpu/mips/r46xx/Makefile.am26
-rw-r--r--c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am27
-rw-r--r--c/src/lib/libcpu/mips/shared/Makefile.am79
-rw-r--r--c/src/lib/libcpu/mips/shared/cache/Makefile.am39
-rw-r--r--c/src/lib/libcpu/mips/shared/interrupts/Makefile.am40
-rw-r--r--c/src/lib/libcpu/mips/tx39/Makefile.am27
-rw-r--r--c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am27
12 files changed, 196 insertions, 214 deletions
diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index fd1a987003..44d1dd461e 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,5 +1,21 @@
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * mongoosev/duart/Makefile.am: Remove.
+ * mongoosev/vectorisrs/Makefile.am: Remove.
+ * mongoosev/Makefile.am: Merge-in vectorisrs/Makefile.am,
+ duart/Makefile.am.
+ * r46xx/vectorisrs/Makefile.am: Remove.
+ * r46xx/Makefile.am: Merge-in vectorisrs/Makefile.am.
+ * shared/cache/Makefile.am: Remove.
+ * shared/interrupts/Makefile.am: Remove.
+ * shared/Makefile.am: Merge-in cache/Makefile.am,
+ interrupts/Makefile.am.
+ * tx39/vectorisrs/Makefile.am: Remove.
+ * tx39/Makefile.am: Merge-in vectorisrs/Makefile.am.
+ * configure.ac: Reflect changes above.
+
+2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* mongoosev/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
* mongoosev/duart/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
* shared/cache/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac
index 091e73dc1d..f152d130f1 100644
--- a/c/src/lib/libcpu/mips/configure.ac
+++ b/c/src/lib/libcpu/mips/configure.ac
@@ -34,15 +34,9 @@ AM_CONDITIONAL(mongoosev, test "$RTEMS_CPU_MODEL" = "mongoosev")
AC_CONFIG_FILES([Makefile
clock/Makefile
mongoosev/Makefile
-mongoosev/duart/Makefile
-mongoosev/vectorisrs/Makefile
shared/Makefile
-shared/cache/Makefile
-shared/interrupts/Makefile
r46xx/Makefile
-r46xx/vectorisrs/Makefile
timer/Makefile
tx39/Makefile
-tx39/vectorisrs/Makefile
])
AC_OUTPUT
diff --git a/c/src/lib/libcpu/mips/mongoosev/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
index db46a164b1..5a5236370e 100644
--- a/c/src/lib/libcpu/mips/mongoosev/Makefile.am
+++ b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
@@ -4,11 +4,56 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
-SUBDIRS = duart vectorisrs
+EXTRA_DIST =
+CLEANDIRS =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
include_mipsdir = $(includedir)/libcpu
include_mips_HEADERS = include/mongoose-v.h
+## duart
+include_libchipdir = $(includedir)/libchip
+include_libchip_HEADERS = duart/mg5uart.h
+
+duart_C_FILES = duart/mg5uart.c duart/mg5uart_reg.c
+EXTRA_DIST += $(duart_C_FILES) duart/README.mguart
+
+duart_rel_OBJECTS = $(duart_C_FILES:duart/%.c=duart/$(ARCH)/%.$(OBJEXT))
+
+duart/$(ARCH)/$(dirstamp):
+ @$(mkdir_p) duart/$(ARCH)
+ @: > duart/$(ARCH)/$(dirstamp)
+duart/$(ARCH)/%.$(OBJEXT): duart/%.c duart/$(ARCH)/$(dirstamp)
+ ${COMPILE} -o $@ -c $<
+duart/$(ARCH)/mg5uart.rel: $(duart_rel_OBJECTS)
+ $(make-rel)
+CLEANDIRS += duart/o-optimize duart/o-debug
+noinst_DATA += duart/$(ARCH)/mg5uart.rel
+
+## vectorisrs
+vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
+EXTRA_DIST += $(vectorisrs_C_FILES)
+
+vectorisrs_rel_OBJECTS = \
+ $(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
+
+vectorisrs/$(ARCH)/$(dirstamp):
+ @$(mkdir_p) vectorisrs/$(ARCH)
+ @: > vectorisrs/$(ARCH)/$(dirstamp)
+vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
+ ${COMPILE} -o $@ -c $<
+vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
+ $(make-rel)
+CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
+noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
+
+## --
+
+all-local: $(PREINSTALL_FILES)
+
all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES =
@@ -21,5 +66,12 @@ $(PROJECT_INCLUDE)/libcpu/mongoose-v.h: include/mongoose-v.h $(PROJECT_INCLUDE)/
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mongoose-v.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mongoose-v.h
-include $(top_srcdir)/../../../automake/subdirs.am
+$(PROJECT_INCLUDE)/libchip/$(dirstamp):
+ @$(mkdir_p) $(PROJECT_INCLUDE)/libchip
+ @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libchip/mg5uart.h: duart/mg5uart.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
+
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
deleted file mode 100644
index 0a0686a654..0000000000
--- a/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/mg5uart.rel
-
-C_FILES = mg5uart.c mg5uart_reg.c
-
-mg5uart_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(mg5uart_rel_OBJECTS)
- $(make-rel)
-
-include_libchipdir = $(includedir)/libchip
-include_libchip_HEADERS = mg5uart.h
-
-all-local: $(PREINSTALL_FILES) $(mg5uart_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = mg5uart.c README.mguart mg5uart.c mg5uart_reg.c
-
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/libchip/$(dirstamp):
- @$(mkdir_p) $(PROJECT_INCLUDE)/libchip
- @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/mg5uart.h: mg5uart.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am
deleted file mode 100644
index 5c98b0dfc6..0000000000
--- a/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/vectorisrs.rel
-
-C_FILES = maxvectors.c vectorisrs.c
-
-vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(vectorisrs_rel_OBJECTS)
- $(make-rel)
-
-all-local: $(vectorisrs_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = vectorisrs.c
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/r46xx/Makefile.am b/c/src/lib/libcpu/mips/r46xx/Makefile.am
index 7f274104d9..74aca69fc0 100644
--- a/c/src/lib/libcpu/mips/r46xx/Makefile.am
+++ b/c/src/lib/libcpu/mips/r46xx/Makefile.am
@@ -4,7 +4,29 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
-SUBDIRS = vectorisrs
+EXTRA_DIST =
+CLEANDIRS =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
+EXTRA_DIST += $(vectorisrs_C_FILES)
+
+vectorisrs_rel_OBJECTS = \
+ $(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
+
+vectorisrs/$(ARCH)/$(dirstamp):
+ @$(mkdir_p) vectorisrs/$(ARCH)
+ @: > vectorisrs/$(ARCH)/$(dirstamp)
+vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
+ ${COMPILE} -o $@ -c $<
+vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
+ $(make-rel)
+CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
+noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
+
+## --
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am
deleted file mode 100644
index 5c98b0dfc6..0000000000
--- a/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/vectorisrs.rel
-
-C_FILES = maxvectors.c vectorisrs.c
-
-vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(vectorisrs_rel_OBJECTS)
- $(make-rel)
-
-all-local: $(vectorisrs_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = vectorisrs.c
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/shared/Makefile.am b/c/src/lib/libcpu/mips/shared/Makefile.am
index 95fd8049bf..c6276b97a1 100644
--- a/c/src/lib/libcpu/mips/shared/Makefile.am
+++ b/c/src/lib/libcpu/mips/shared/Makefile.am
@@ -2,7 +2,82 @@
## $Id$
##
-SUBDIRS = cache interrupts
+EXTRA_DIST =
+CLEANDIRS =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+## cache
+include_libcpudir = $(includedir)/libcpu
+
+noinst_HEADERS = cache/cache_.h
+include_libcpu_HEADERS = ../../shared/include/cache.h
+
+cache_C_FILES = cache/cache.c
+common_C_FILES = ../../shared/src/cache_aligned_malloc.c
+common_C_FILES += ../../shared/src/cache_manager.c
+
+cache_rel_OBJECTS = $(cache_C_FILES:cache/%.c=cache/$(ARCH)/%.$(OBJEXT))
+cache_rel_OBJECTS += \
+ $(common_C_FILES:../../shared/src/%.c=cache/$(ARCH)/%.$(OBJEXT))
+
+AM_CPPFLAGS += -I$(srcdir)/cache
+
+cache/$(ARCH)/$(dirstamp):
+ @$(mkdir_p) cache/$(ARCH)
+ @: > cache/$(ARCH)/$(dirstamp)
+cache/$(ARCH)/%.$(OBJEXT): cache/%.c cache/$(ARCH)/$(dirstamp)
+ ${COMPILE} -o $@ -c $<
+cache/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c cache/$(ARCH)/$(dirstamp)
+ ${COMPILE} -o $@ -c $<
+cache/$(ARCH)/cache.rel: $(cache_rel_OBJECTS)
+ $(make-rel)
+CLEANDIRS += cache/o-optimize cache/o-debug
+noinst_DATA += cache/$(ARCH)/cache.rel
+
+## interrupts
+
+interrupts_C_FILES = interrupts/installisrentries.c \
+ interrupts/vectorexceptions.c
+interrupts_S_FILES = interrupts/isr_entries.S
+
+interrupts_rel_OBJECTS = \
+ $(interrupts_C_FILES:interrupts/%.c=interrupts/$(ARCH)/%.$(OBJEXT)) \
+ $(interrupts_S_FILES:interrupts/%.S=interrupts/$(ARCH)/%.$(OBJEXT))
+
+if tx39
+EXTRA_FLAGS = -DTX39
+endif
+
+if mongoosev
+EXTRA_FLAGS = -DMONGOOSEV
+endif
+
+AM_CPPFLAGS += $(EXTRA_FLAGS)
+
+interrupts/$(ARCH)/$(dirstamp):
+ @$(mkdir_p) interrupts/$(ARCH)
+ @: > interrupts/$(ARCH)/$(dirstamp)
+interrupts/$(ARCH)/%.$(OBJEXT): interrupts/%.c interrupts/$(ARCH)/$(dirstamp)
+ ${COMPILE} -o $@ -c $<
+interrupts/$(ARCH)/%.$(OBJEXT): interrupts/%.S interrupts/$(ARCH)/$(dirstamp)
+ ${CCASCOMPILE} -o $@ -c $<
+interrupts/$(ARCH)/interrupts.rel: $(interrupts_rel_OBJECTS)
+ $(make-rel)
+CLEANDIRS += interrupts/o-optimize interrupts/o-debug
+noinst_DATA += interrupts/$(ARCH)/interrupts.rel
+
+## --
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+ @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
+ @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/shared/cache/Makefile.am b/c/src/lib/libcpu/mips/shared/cache/Makefile.am
deleted file mode 100644
index 6495263b58..0000000000
--- a/c/src/lib/libcpu/mips/shared/cache/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## $Id$
-##
-
-VPATH = @srcdir@:@srcdir@/../../../shared/src
-
-C_FILES = cache.c cache_aligned_malloc.c cache_manager.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include_libcpudir = $(includedir)/libcpu
-
-noinst_HEADERS = cache_.h
-include_libcpu_HEADERS = cache.h
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-AM_CPPFLAGS += -I$(srcdir)
-
-cache.h: $(top_srcdir)/../shared/include/cache.h
- cp $< $@
-
-all-local: $(PREINSTALL_FILES) $(OBJS)
-
-CLEANFILES = cache.h
-
-EXTRA_DIST = cache.c cache_.h
-
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
- @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
- @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/cache.h: cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am b/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am
deleted file mode 100644
index e43fa7263c..0000000000
--- a/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/interrupts.rel
-
-C_FILES = installisrentries.c vectorexceptions.c
-
-S_FILES = isr_entries.S
-
-interrupts_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
- $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-if tx39
-EXTRA_FLAGS = -DTX39
-endif
-
-if mongoosev
-EXTRA_FLAGS = -DMONGOOSEV
-endif
-
-AM_CPPFLAGS += $(EXTRA_FLAGS)
-
-$(PGM): $(interrupts_rel_OBJECTS)
- $(make-rel)
-
-all-local: $(interrupts_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = maxvectors.c
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/tx39/Makefile.am b/c/src/lib/libcpu/mips/tx39/Makefile.am
index 58e3ff558b..df8a74810f 100644
--- a/c/src/lib/libcpu/mips/tx39/Makefile.am
+++ b/c/src/lib/libcpu/mips/tx39/Makefile.am
@@ -4,11 +4,35 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
-SUBDIRS = . vectorisrs
+EXTRA_DIST =
+CLEANDIRS =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = include/tx3904.h
+## vectorisrs
+vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
+EXTRA_DIST += $(vectorisrs_C_FILES)
+
+vectorisrs_rel_OBJECTS = \
+ $(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
+
+vectorisrs/$(ARCH)/$(dirstamp):
+ @$(mkdir_p) vectorisrs/$(ARCH)
+ @: > vectorisrs/$(ARCH)/$(dirstamp)
+vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
+ ${COMPILE} -o $@ -c $<
+vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
+ $(make-rel)
+CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
+noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
+
+## --
+
all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES =
@@ -21,5 +45,4 @@ $(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am
deleted file mode 100644
index 5c98b0dfc6..0000000000
--- a/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/vectorisrs.rel
-
-C_FILES = maxvectors.c vectorisrs.c
-
-vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(vectorisrs_rel_OBJECTS)
- $(make-rel)
-
-all-local: $(vectorisrs_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = vectorisrs.c
-
-include $(top_srcdir)/../../../automake/local.am