2004-02-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
	start/Makefile.am, startup/Makefile.am, timer/Makefile.am,
	wrapup/Makefile.am. Use automake compilation rules.
	* clock/Makefile.am, console/Makefile.am, start/Makefile.am,
	startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
	* bsp_specs: Sync with other BSPs, fixup missing brace.

c/src/lib/libbsp/i960/rxgen960/ChangeLog

@@ -1,3 +1,13 @@
+2004-02-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
+	start/Makefile.am, startup/Makefile.am, timer/Makefile.am,
+	wrapup/Makefile.am. Use automake compilation rules.
+	* clock/Makefile.am, console/Makefile.am, start/Makefile.am,
+	startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
+	* configure.ac: Reflect changes above.
+	* bsp_specs: Sync with other BSPs, fixup missing brace.
+
 2004-01-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Add nostdinc to AUTOMAKE_OPTIONS.

c/src/lib/libbsp/i960/rxgen960/Makefile.am

@@ -4,26 +4,129 @@
 
 ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
-# wrapup is the one that actually builds and installs the library
+include $(top_srcdir)/../../../../automake/compile.am
-# from the individual .rel files built in other directories
-SUBDIRS = . start startup clock console timer wrapup
-
 include $(top_srcdir)/../../bsp.am
 
-nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
 
-all-local: $(PREINSTALL_FILES)
+nodist_include_HEADERS += ../../shared/include/coverhd.h
 
-noinst_HEADERS = include/rxgen960_config.h
+# FIXME: this file should be called start.S
+EXTRA_DIST = start/rxgen_romld.S
+rxgen_romld$(LIB_VARIANT).$(OBJEXT): start/rxgen_romld.S
+	${CCASCOMPILE} -DASM -o $@ -c $<
+project_lib_DATA = rxgen_romld$(LIB_VARIANT).$(OBJEXT)
+
+dist_project_lib_DATA += startup/linkcmds startup/linkcmds.real \
+startup/rom.ld
+
+EXTRA_PROGRAMS += clock.rel
+CLEANFILES += clock.rel
+clock_rel_SOURCES = clock/ckinit.c
+clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += clock_g.rel
+CLEANFILES += clock_g.rel
+clock_g_rel_SOURCES = $(clock_rel_SOURCES)
+clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += clock$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += console.rel
+CLEANFILES += console.rel
+console_rel_SOURCES = console/concntl.h console/console.c console/serial.c \
+    console/serial.h
+console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += console_g.rel
+CLEANFILES += console_g.rel
+console_g_rel_SOURCES = $(console_rel_SOURCES)
+console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += console$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += startup.rel
+CLEANFILES += startup.rel
+startup_rel_SOURCES = include/rxgen960_config.h startup/asmfault.h \
+    startup/asmfault.S startup/asmstub.h startup/asmstub.S \
+    ../../shared/bootcard.c ../../shared/bspclean.c ../../shared/bsplibc.c \
+    ../../shared/bsppost.c startup/bspstart.c startup/cntrltbl.c \
+    startup/cntrltbl.h startup/exit.c startup/fault.c startup/fault.h \
+    startup/faultret.h startup/flttbl.c startup/flttbl.h startup/frmstr.c \
+    startup/frmstr.h startup/i960.h startup/ihandler.h startup/ihandler.S \
+    startup/intrtbl.c startup/intrtbl.h startup/kkprintf.c \
+    ../../shared/main.c startup/main.h startup/memchnl.h startup/nmi.c \
+    startup/nulsystbl.c startup/pmc901_memmap.h startup/prcb.c \
+    startup/prcb.h startup/rom_cntrltbl.c startup/rom_ibr.c \
+    startup/rom_ibr.h startup/rommon.h startup/rom_prcb.c \
+    ../../shared/sbrk.c startup/sctns.c startup/sctns.h startup/setvec.c \
+    startup/systbl.c startup/systbl.h startup/time.h
+startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += startup_g.rel
+CLEANFILES += startup_g.rel
+startup_g_rel_SOURCES = $(startup_rel_SOURCES)
+startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += startup$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += timer.rel
+CLEANFILES += timer.rel
+timer_rel_SOURCES = timer/timer.c
+UNUSED_FILES = timer/timerisr.S
+timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += timer_g.rel
+CLEANFILES += timer_g.rel
+timer_g_rel_SOURCES = $(timer_rel_SOURCES)
+timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += timer$(LIB_VARIANT).rel
+
+EXTRA_LIBRARIES = libbsp.a
+CLEANFILES += libbsp.a
+libbsp_a_SOURCES =
+libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
+    console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
+libbsp_a_LIBADD += \
+    ../../../libcpu/@RTEMS_CPU@/i960rp/score$(LIB_VARIANT).rel
+
+EXTRA_LIBRARIES += libbsp_g.a
+CLEANFILES += libbsp_g.a
+libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
+libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
+
+noinst_DATA += libbsp$(LIB_VARIANT).a
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 PREINSTALL_DIRS =
+TMPINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
-CLEANFILES = $(PREINSTALL_FILES)
+$(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT): rxgen_romld$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
+
+$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
+TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
+
+CLEANFILES += $(PREINSTALL_FILES)
+DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES += $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/i960/rxgen960/bsp_specs

@@ -3,8 +3,9 @@
 %rename link old_link
 
 *startfile:
-%{!qrtems: %(old_startfile)} \
+%{!qrtems: %(old_startfile)}  %{!nostdlib: %{qrtems: \
-%{qrtems: %{qrtems_debug: rxgen_romld_g.o%s} %{!qrtems_debug: rxgen_romld.o%s}}}
+%{!qrtems_debug: rxgen_romld.o%s} \
+%{qrtems_debug: rxgen_romld_g.o%s}}}
 
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start}

c/src/lib/libbsp/i960/rxgen960/clock/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am

@@ -1,30 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/clock.rel
-
-C_FILES = ckinit.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-
-all-local: $(OBJS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = ckinit.c
-
-include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/i960/rxgen960/configure.ac

@@ -16,11 +16,5 @@ RTEMS_CANONICALIZE_TOOLS
 RTEMS_PROG_CCAS
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([Makefile])
-clock/Makefile
-console/Makefile
-start/Makefile
-startup/Makefile
-timer/Makefile
-wrapup/Makefile])
 AC_OUTPUT

c/src/lib/libbsp/i960/rxgen960/console/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libbsp/i960/rxgen960/console/Makefile.am

@@ -1,30 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/console.rel
-
-C_FILES = console.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-
-all-local: $(OBJS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = concntl.h console.c serial.c serial.h
-
-include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/i960/rxgen960/start/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libbsp/i960/rxgen960/start/Makefile.am

@@ -1,37 +0,0 @@
-##
-## $Id$
-##
-
-S_FILES = rxgen_romld.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(S_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-include $(top_srcdir)/../../bspstart.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-project_lib_DATA = $(ARCH)/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
-
-all-local: $(ARCH)/rxgen_romld.$(OBJEXT) $(TMPINSTALL_FILES)
-
-EXTRA_DIST = rxgen_romld.S
-
-TMPINSTALL_FILES =
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rxgen_romld$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/i960/rxgen960/startup/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am

@@ -1,62 +0,0 @@
-##
-## $Id$
-##
-
-VPATH = @srcdir@:@srcdir@/../../../shared
-
-PGM = $(ARCH)/startup.rel
-
-#C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \
-#    gnatinstallhandler
-C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c cntrltbl.c \
-    exit.c fault.c flttbl.c frmstr.c intrtbl.c kkprintf.c main.c nmi.c \
-    nulsystbl.c prcb.c rom_cntrltbl.c rom_ibr.c rom_prcb.c sbrk.c sctns.c \
-    setvec.c systbl.c
-
-noinst_HEADERS = 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
-
-S_FILES = asmfault.S asmstub.S ihandler.S
-
-OBJS = $(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 +=
-#
-
-$(PGM): $(OBJS)
-	$(make-rel)
-
-project_lib_DATA = linkcmds
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-
-all-local: $(PGM) $(TMPINSTALL_FILES)
-
-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
-
-TMPINSTALL_FILES =
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/linkcmds: linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/i960/rxgen960/timer/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am

@@ -1,30 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/timer.rel
-
-C_FILES = timer.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-
-all-local: $(OBJS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = timer.c timerisr.S
-
-include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/i960/rxgen960/wrapup/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am

@@ -1,19 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-BSP_PIECES = startup clock console timer
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
-    ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score$(LIB_VARIANT).rel
-
-$(ARCH)/libbsp.a: $(OBJS)
-	$(make-library)
-
-noinst_DATA = $(ARCH)/libbsp.a
-
-include $(top_srcdir)/../../../../automake/local.am