4 files changed, 11 insertions, 21 deletions
diff --git a/c/src/lib/libbsp/i960/configure.in b/c/src/lib/libbsp/i960/configure.in
index e9b306361c..6b20653fb3 100644
--- a/c/src/lib/libbsp/i960/configure.in
+++ b/c/src/lib/libbsp/i960/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)
 
-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
diff --git a/c/src/lib/libbsp/i960/cvme961/configure.in b/c/src/lib/libbsp/i960/cvme961/configure.in
index 2fcffc49dd..0de4f5d17e 100644
--- a/c/src/lib/libbsp/i960/cvme961/configure.in
+++ b/c/src/lib/libbsp/i960/cvme961/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-cvme961,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
@@ -20,11 +21,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST
 
-RTEMS_PROJECT_ROOT
-
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
diff --git a/c/src/lib/libbsp/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in
index f974725f55..7863bfb9cf 100644
--- a/c/src/lib/libbsp/i960/rxgen960/configure.in
+++ b/c/src/lib/libbsp/i960/rxgen960/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-rxgen960,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
@@ -20,11 +21,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST
 
-RTEMS_PROJECT_ROOT
-
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
index a255a83daa..11a7554242 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
@@ -32,18 +32,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-# FIXME: The original Makefile.in contained this:
-#> XXX: JRS look at the list of objects installed
-#>	$(INSTALL_CHANGE) -m 644 $(OBJS) $(PROJECT_RELEASE)/lib
-#
-# The install_change line could probably be replaced by this:
-# $(PROJECT_RELEASE)/lib/%.o: $(ARCH)/%.o
-#	$(INSTALL_DATA) $< $@
-# TMPINSTALL_FILES += \
-#  $(OBJS:$(ARCH)/%.o=$(PROJECT_RELEASE)/lib/%.o)
-#
-# .. but this behavior seems to be rather questionable :(
-
 $(PROJECT_RELEASE)/lib/linkcmds: linkcmds
 	$(INSTALL_DATA) $< $@