summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-12-16 06:12:40 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-12-16 06:12:40 +0000
commitc75dbae3e79e92060345082fafa624b9d52f4896 (patch)
tree76e862f66367a3fc69a568b26e88dc0467610956 /c/src/lib/libcpu
parent2002-12-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-c75dbae3e79e92060345082fafa624b9d52f4896.tar.bz2
2002-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove CPU_MODEL_SUBDIR. * configure.ac: Remove RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP). * i960ca/Makefile.am: Eliminate *_O_FILES. Don't include @RTEMS_BSP@.cfg. * i960ka/Makefile.am: Ditto. * i960rp/Makefile.am: Ditto.
Diffstat (limited to 'c/src/lib/libcpu')
-rw-r--r--c/src/lib/libcpu/i960/ChangeLog9
-rw-r--r--c/src/lib/libcpu/i960/Makefile.am14
-rw-r--r--c/src/lib/libcpu/i960/configure.ac2
-rw-r--r--c/src/lib/libcpu/i960/i960ca/Makefile.am5
-rw-r--r--c/src/lib/libcpu/i960/i960ka/Makefile.am5
-rw-r--r--c/src/lib/libcpu/i960/i960rp/Makefile.am5
6 files changed, 13 insertions, 27 deletions
diff --git a/c/src/lib/libcpu/i960/ChangeLog b/c/src/lib/libcpu/i960/ChangeLog
index 16abf4dfa0..f771b99a1e 100644
--- a/c/src/lib/libcpu/i960/ChangeLog
+++ b/c/src/lib/libcpu/i960/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Remove CPU_MODEL_SUBDIR.
+ * configure.ac: Remove RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP).
+ * i960ca/Makefile.am: Eliminate *_O_FILES.
+ Don't include @RTEMS_BSP@.cfg.
+ * i960ka/Makefile.am: Ditto.
+ * i960rp/Makefile.am: Ditto.
+
2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove RTEMS_CHECK_BSP_CACHE.
diff --git a/c/src/lib/libcpu/i960/Makefile.am b/c/src/lib/libcpu/i960/Makefile.am
index 542657c03e..99af625698 100644
--- a/c/src/lib/libcpu/i960/Makefile.am
+++ b/c/src/lib/libcpu/i960/Makefile.am
@@ -4,19 +4,7 @@
ACLOCAL_AMFLAGS = -I ../../../../../aclocal
-if i960ca
-CPU_SUBDIR = i960ca
-endif
-
-if i960ka
-CPU_SUBDIR = i960ka
-endif
-
-if i960rp
-CPU_SUBDIR = i960rp
-endif
-
-SUBDIRS = include $(CPU_SUBDIR)
+SUBDIRS = include i960ca i960ka i960rp
include $(top_srcdir)/../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/i960/configure.ac b/c/src/lib/libcpu/i960/configure.ac
index 0fa95ddb34..03fbcc26a6 100644
--- a/c/src/lib/libcpu/i960/configure.ac
+++ b/c/src/lib/libcpu/i960/configure.ac
@@ -24,8 +24,6 @@ RTEMS_PROJECT_ROOT
RTEMS_PROG_CC_FOR_TARGET
RTEMS_CANONICALIZE_TOOLS
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
AM_CONDITIONAL(i960ca, test "$RTEMS_CPU_MODEL" = "i960ca")
AM_CONDITIONAL(i960ka, test "$RTEMS_CPU_MODEL" = "i960ka")
AM_CONDITIONAL(i960rp, test "$RTEMS_CPU_MODEL" = "i960rp")
diff --git a/c/src/lib/libcpu/i960/i960ca/Makefile.am b/c/src/lib/libcpu/i960/i960ca/Makefile.am
index 29fc74a55a..d21cbeb6f8 100644
--- a/c/src/lib/libcpu/i960/i960ca/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960ca/Makefile.am
@@ -3,14 +3,11 @@
##
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am
C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
#
# (OPTIONAL) Add local stuff here using +=
diff --git a/c/src/lib/libcpu/i960/i960ka/Makefile.am b/c/src/lib/libcpu/i960/i960ka/Makefile.am
index 547656dfc2..9873994585 100644
--- a/c/src/lib/libcpu/i960/i960ka/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960ka/Makefile.am
@@ -3,14 +3,11 @@
##
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am
C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
#
# (OPTIONAL) Add local stuff here using +=
diff --git a/c/src/lib/libcpu/i960/i960rp/Makefile.am b/c/src/lib/libcpu/i960/i960rp/Makefile.am
index b60d5070cc..292744a0f8 100644
--- a/c/src/lib/libcpu/i960/i960rp/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960rp/Makefile.am
@@ -3,14 +3,11 @@
##
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am
C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
#
# (OPTIONAL) Add local stuff here using +=