2 files changed, 66 insertions, 81 deletions
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
new file mode 100644
index 0000000000..a255a83daa
--- /dev/null
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
@@ -0,0 +1,66 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+VPATH = @srcdir@:@srcdir@/../../../shared
+
+PGM = $(ARCH)/startup.rel
+
+#C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \
+#    gnatinstallhandler
+C_FILES = bspstart.c cntrltbl.c exit.c fault.c flttbl.c frmstr.c intrtbl.c \
+    kkprintf.c nmi.c nulsystbl.c prcb.c rom_cntrltbl.c rom_ibr.c rom_prcb.c \
+    sctns.c setvec.c systbl.c
+
+H_FILES = asmfault.h asmstub.h cntrltbl.h fault.h faultret.h flttbl.h \
+    frmstr.h i960.h ihandler.h intrtbl.h main.h memchnl.h pmc901_memmap.h \
+    prcb.h rom_ibr.h rommon.h sctns.h systbl.h time.h types.h
+
+S_FILES = asmfault.S asmstub.S ihandler.S rxgen_romld.S
+
+OBJS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(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) $< $@
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
+
+all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = asmfault.S asmfault.h asmstub.S asmstub.h bspstart.c cntrltbl.c \
+    cntrltbl.h dram.ld exit.c fault.c fault.h faultret.h flttbl.c flttbl.h \
+    frmstr.c frmstr.h i960.h ihandler.S ihandler.h intrtbl.c intrtbl.h \
+    kkprintf.c linkcmds main.h memchnl.h nmi.c nulsystbl.c pmc901_memmap.h \
+    prcb.c prcb.h rom.ld rom_cntrltbl.c rom_ibr.c rom_ibr.h rom_prcb.c \
+    rommon.h rxgen_romld.S sctns.c sctns.h setvec.c systbl.c systbl.h time.h \
+    types.h
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.in
deleted file mode 100644
index de7e1da02a..0000000000
--- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = startup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@:@srcdir@/../../../shared
-
-PGM = ${ARCH}/startup.rel
-
-# C source names, if any, go here -- minus the .c
-#C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \
-#    gnatinstallhandler
-C_PIECES = bspstart cntrltbl exit fault flttbl frmstr intrtbl kkprintf nmi \
-    nulsystbl prcb rom_cntrltbl rom_ibr rom_prcb sctns setvec systbl
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-S_PIECES = asmfault asmstub ihandler rxgen_romld
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-
-SRCS = $(C_FILES) $(S_FILES) $(H_FILES)
-OBJS = $(C_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_RELEASE)/lib
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(PGM): ${OBJS}
-	$(make-rel)
-
-# XXX JRS look at the list of objects installed
-all: ${ARCH} $(SRCS) $(PGM)
-	$(INSTALL_CHANGE) -m 644 $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
-	$(INSTALL_CHANGE) -m 644 $(OBJS) $(PROJECT_RELEASE)/lib
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install: all
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status