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

	* Makefile.am: Merge-in 3c509/Makefile.am, clock/Makefile.am,
	console/Makefile.am, ide/Makefile.am, ne2000/Makefile.am,
	startup/Makefile.am, timer/Makefile.am, wd8003/Makefile.am,
	wrapup/Makefile.am. Use automake compilation rules.
	* 3c509/Makefile.am, clock/Makefile.am, console/Makefile.am,
	ide/Makefile.am, ne2000/Makefile.am, startup/Makefile.am,
	timer/Makefile.am, wd8003/Makefile.am, wrapup/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
	* start/start.S: Change comment to make it gcc -ansi compliant.

22 files changed, 255 insertions, 393 deletions

diff --git a/c/src/lib/libbsp/i386/pc386/3c509/.cvsignore b/c/src/lib/libbsp/i386/pc386/3c509/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/pc386/3c509/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am
deleted file mode 100644
index 5374b22cdd..0000000000
--- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/3c509.rel
-
-C_FILES = 3c509.c elink.c
-X3c509_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-noinst_HEADERS = 3c509.h elink.h
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-
-$(PGM): $(X3c509_rel_OBJECTS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by
-# 	../wrapup/Makefile
-
-if HAS_NETWORKING
-all-local: $(X3c509_rel_OBJECTS) $(PGM)
-endif
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = 3c509.c 3c509.h elink.c elink.h
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 2995b146c6..316bf04ec8 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Merge-in 3c509/Makefile.am, clock/Makefile.am,
+	console/Makefile.am, ide/Makefile.am, ne2000/Makefile.am,
+	startup/Makefile.am, timer/Makefile.am, wd8003/Makefile.am,
+	wrapup/Makefile.am. Use automake compilation rules.
+	* 3c509/Makefile.am, clock/Makefile.am, console/Makefile.am,
+	ide/Makefile.am, ne2000/Makefile.am, startup/Makefile.am,
+	timer/Makefile.am, wd8003/Makefile.am, wrapup/Makefile.am: Remove.
+	* configure.ac: Reflect changes above.
+	* start/start.S: Change comment to make it gcc -ansi compliant.
+
 2004-01-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Add nostdinc to AUTOMAKE_OPTIONS.
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index f4a94bd913..a57e559ec7 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -6,75 +6,286 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
 # FIXME: We must not include *.cfg
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-# wrapup is the one that actually builds and installs the library
-# from the individual .rel files built in other directories
-SUBDIRS = . tools startup clock console timer ne2000 wd8003 3c509 ide \
-    wrapup
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
 
-# This driver needs to be reworked for the BSD stack.
-# We only install wd80x3.h if HAS_NETWORKING was defined
-if HAS_NETWORKING
-include_HEADERS += include/wd80x3.h
-endif
+SUBDIRS = . tools
 
 include_HEADERS += include/crt.h
-nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
+nodist_include_HEADERS += ../../shared/include/coverhd.h
 
-S_FILES = start/start.S
-$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp)
+EXTRA_DIST = start/start.S
+start$(LIB_VARIANT).$(OBJEXT): start/start.S
 	${CCASCOMPILE} -DASM -o $@ -c $<
 
-project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
+project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
 
-S_FILES += start/start16.S
-$(ARCH)/start16.$(OBJEXT): start/start16.S $(ARCH)/$(dirstamp)
+EXTRA_DIST += start/start16.S
+start16.$(OBJEXT): start/start16.S
 	$(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $<
 
-$(ARCH)/start16$(LIB_VARIANT)-elf32.$(OBJEXT): $(ARCH)/start16.$(OBJEXT) $(ARCH)/$(dirstamp)
+start16$(LIB_VARIANT)-elf32.$(OBJEXT): start16.$(OBJEXT)
 	$(LD) -N -T $(top_srcdir)/startup/linkcmds -Ttext $(START16ADDR) -e start16 -nostdlib \
 	  --oformat=elf32-i386 \
 	-o $@ $<
 
-$(ARCH)/start16$(LIB_VARIANT).bin: $(ARCH)/start16$(LIB_VARIANT)-elf32.$(OBJEXT)
+start16$(LIB_VARIANT).bin: start16$(LIB_VARIANT)-elf32.$(OBJEXT)
 	$(OBJCOPY) -O binary $< $@
 
-project_lib_DATA += $(ARCH)/start16$(LIB_VARIANT).bin
+project_lib_DATA += start16$(LIB_VARIANT).bin
 
-all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+dist_project_lib_DATA += startup/linkcmds
 
-EXTRA_DIST = HOWTO README.dec21140 STATUS times_i486dx times_p5
+EXTRA_PROGRAMS += clock.rel
+CLEANFILES += clock.rel
+clock_rel_SOURCES = clock/ckinit.c clock/rtc.c
+clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-PREINSTALL_DIRS =
-TMPINSTALL_FILES =
+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)
+
+project_lib_DATA += clock$(LIB_VARIANT).rel
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS = console/keyboard.h console/kd.h \
+    console/serial_mouse.h console/ps2_drv.h console/fb_vga.h
+
+EXTRA_PROGRAMS += console.rel
+CLEANFILES += console.rel
+console_rel_SOURCES = console/console.c console/inch.c console/outch.c \
+    console/defkeymap.c console/fb_vga.c console/keyboard.c \
+    console/mouse_parser.c console/pc_keyb.c console/ps2_mouse.c \
+    console/serial_mouse.c console/vgainit.c console/vt.c \
+    console/videoAsm.S
+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)
+
+project_lib_DATA += console$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += startup.rel
+CLEANFILES += startup.rel
+startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+    startup/bspstart.c startup/exit.c ../../i386/shared/irq/idt.c \
+    ../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \
+    ../../shared/bootcard.c ../../shared/main.c ../../shared/sbrk.c \
+    ../../i386/shared/comm/i386-stub.c \
+    ../../i386/shared/comm/i386-stub-glue.c ../../i386/shared/comm/uart.c \
+    ../../i386/shared/pci/pcibios.c ../../shared/gnatinstallhandler.c \
+    ../../i386/shared/comm/gdb_glue.c ../../i386/shared/comm/tty_drv.c \
+    startup/ldsegs.S ../../i386/shared/irq/irq_asm.S
+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)
+
+project_lib_DATA += startup$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += timer.rel
+CLEANFILES += timer.rel
+timer_rel_SOURCES = timer/timer.c 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)
+
+project_lib_DATA += timer$(LIB_VARIANT).rel
 
 if HAS_NETWORKING
-$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h
+ne2000_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
+EXTRA_PROGRAMS += ne2000.rel
+CLEANFILES += ne2000.rel
+ne2000_rel_SOURCES = ne2000/ne2000.c
+ne2000_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
+    $(ne2000_CPPFLAGS)
+ne2000_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += ne2000_g.rel
+CLEANFILES += ne2000_g.rel
+ne2000_g_rel_SOURCES = $(ne2000_rel_SOURCES)
+ne2000_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(ne2000_CPPFLAGS)
+ne2000_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += ne2000$(LIB_VARIANT).rel
+endif
+
+if HAS_NETWORKING
+# This driver needs to be reworked for the BSD stack.
+# We only install wd80x3.h if HAS_NETWORKING was defined
+include_HEADERS += include/wd80x3.h
+
+wd8003_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
+EXTRA_PROGRAMS += wd8003.rel
+CLEANFILES += wd8003.rel
+wd8003_rel_SOURCES = wd8003/wd8003.c include/wd80x3.h
+wd8003_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
+    $(wd8003_CPPFLAGS)
+wd8003_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += wd8003_g.rel
+CLEANFILES += wd8003_g.rel
+wd8003_g_rel_SOURCES = $(wd8003_rel_SOURCES)
+wd8003_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(wd8003_CPPFLAGS)
+wd8003_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += wd8003$(LIB_VARIANT).rel
 endif
 
+if HAS_NETWORKING
+3c509_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
+EXTRA_PROGRAMS += 3c509.rel
+CLEANFILES += 3c509.rel
+3c509_rel_SOURCES = 3c509/3c509.c 3c509/3c509.h 3c509/elink.c 3c509/elink.h
+3c509_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(3c509_CPPFLAGS)
+3c509_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += 3c509_g.rel
+CLEANFILES += 3c509_g.rel
+3c509_g_rel_SOURCES = $(3c509_rel_SOURCES)
+3c509_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(3c509_CPPFLAGS)
+3c509_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += 3c509$(LIB_VARIANT).rel
+endif
+
+EXTRA_PROGRAMS += ide.rel
+CLEANFILES += ide.rel
+ide_rel_SOURCES = ide/idecfg.c ide/ide.c
+ide_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += ide_g.rel
+CLEANFILES += ide_g.rel
+ide_g_rel_SOURCES = $(ide_rel_SOURCES)
+ide_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+ide_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+project_lib_DATA += ide$(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 ide$(LIB_VARIANT).rel
+# We only build the Network library if HAS_NETWORKING was defined
+# dec21140 is supported via libchip
+if HAS_NETWORKING
+libbsp_a_LIBADD += ne2000$(LIB_VARIANT).rel wd8003$(LIB_VARIANT).rel \
+    3c509(LIB_VARIANT).rel
+endif
+libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \
+    ../../../libcpu/i386/page$(LIB_VARIANT).rel \
+    ../../../libcpu/i386/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)
+
+EXTRA_DIST += HOWTO README.dec21140 STATUS times_i486dx times_p5
+
+PREINSTALL_DIRS =
+TMPINSTALL_FILES =
+
 $(PROJECT_INCLUDE)/crt.h: include/crt.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.h
 
-$(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
 
-$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
 
-$(PROJECT_LIB)/start16$(LIB_VARIANT).bin: $(ARCH)/start16$(LIB_VARIANT).bin $(PROJECT_LIB)/$(dirstamp)
+$(PROJECT_LIB)/start16$(LIB_VARIANT).bin: start16$(LIB_VARIANT).bin $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start16$(LIB_VARIANT).bin
 TMPINSTALL_FILES += $(PROJECT_LIB)/start16$(LIB_VARIANT).bin
 
-CLEANFILES = $(PREINSTALL_FILES)
+$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
+TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
+
+$(PROJECT_LIB)/clock$(LIB_VARIANT).rel: clock$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/clock$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/clock$(LIB_VARIANT).rel
+
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
+	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/keyboard.h: console/keyboard.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/keyboard.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/keyboard.h
+
+$(PROJECT_INCLUDE)/rtems/kd.h: console/kd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/kd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/kd.h
+
+$(PROJECT_INCLUDE)/rtems/serial_mouse.h: console/serial_mouse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serial_mouse.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serial_mouse.h
+
+$(PROJECT_INCLUDE)/rtems/ps2_drv.h: console/ps2_drv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ps2_drv.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ps2_drv.h
+
+$(PROJECT_INCLUDE)/rtems/fb_vga.h: console/fb_vga.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb_vga.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb_vga.h
+
+$(PROJECT_LIB)/console$(LIB_VARIANT).rel: console$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/console$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/console$(LIB_VARIANT).rel
+
+$(PROJECT_LIB)/startup$(LIB_VARIANT).rel: startup$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/startup$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/startup$(LIB_VARIANT).rel
+
+$(PROJECT_LIB)/timer$(LIB_VARIANT).rel: timer$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/timer$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/timer$(LIB_VARIANT).rel
+
+if HAS_NETWORKING
+$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h
+endif
+
+$(PROJECT_LIB)/ide$(LIB_VARIANT).rel: ide$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/ide$(LIB_VARIANT).rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/ide$(LIB_VARIANT).rel
+
+CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 CLEANFILES += $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/clock/.cvsignore b/c/src/lib/libbsp/i386/pc386/clock/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/pc386/clock/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am
deleted file mode 100644
index 575a9d79e7..0000000000
--- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/clock.rel
-
-C_FILES = ckinit.c rtc.c
-clock_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): $(clock_rel_OBJECTS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by
-# 	../wrapup/Makefile
-
-all-local: $(clock_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = ckinit.c rtc.c
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac
index 108fef3028..3d8829632a 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/configure.ac
@@ -28,14 +28,5 @@ RTEMS_CONFIG_BUILD_SUBDIRS(tools)
 AC_SUBST(RTEMS_BSP)
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-clock/Makefile
-console/Makefile
-startup/Makefile
-timer/Makefile
-3c509/Makefile
-ne2000/Makefile
-wd8003/Makefile
-ide/Makefile
-wrapup/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/i386/pc386/console/.cvsignore b/c/src/lib/libbsp/i386/pc386/console/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/pc386/console/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.am b/c/src/lib/libbsp/i386/pc386/console/Makefile.am
deleted file mode 100644
index 93f925a6b3..0000000000
--- a/c/src/lib/libbsp/i386/pc386/console/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/console.rel
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = keyboard.h kd.h serial_mouse.h ps2_drv.h fb_vga.h
-
-C_FILES = console.c inch.c outch.c defkeymap.c fb_vga.c keyboard.c \
-    mouse_parser.c pc_keyb.c ps2_mouse.c serial_mouse.c vgainit.c vt.c
-S_FILES = videoAsm.S
-
-console_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 +=
-#
-
-$(PGM): $(console_rel_OBJECTS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by
-# 	../wrapup/Makefile
-
-all-local: $(PREINSTALL_FILES) $(console_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = $(C_FILES) $(S_FILES)
-
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/keyboard.h: keyboard.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/keyboard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/keyboard.h
-
-$(PROJECT_INCLUDE)/rtems/kd.h: kd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/kd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/kd.h
-
-$(PROJECT_INCLUDE)/rtems/serial_mouse.h: serial_mouse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serial_mouse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serial_mouse.h
-
-$(PROJECT_INCLUDE)/rtems/ps2_drv.h: ps2_drv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ps2_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ps2_drv.h
-
-$(PROJECT_INCLUDE)/rtems/fb_vga.h: fb_vga.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb_vga.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb_vga.h
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/ide/.cvsignore b/c/src/lib/libbsp/i386/pc386/ide/.cvsignore
deleted file mode 100644
index 3dda72986f..0000000000
--- a/c/src/lib/libbsp/i386/pc386/ide/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/c/src/lib/libbsp/i386/pc386/ide/Makefile.am b/c/src/lib/libbsp/i386/pc386/ide/Makefile.am
deleted file mode 100644
index 3e9db588b8..0000000000
--- a/c/src/lib/libbsp/i386/pc386/ide/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-##
-## Makefile.am,v 1.5 2002/08/11 06:59:03 ralf Exp
-##
-
-PGM = ide.rel
-
-C_FILES = idecfg.c ide.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 = idecfg.c
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/.cvsignore b/c/src/lib/libbsp/i386/pc386/ne2000/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/pc386/ne2000/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am
deleted file mode 100644
index d5f1b51923..0000000000
--- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/ne2000.rel
-
-C_FILES = ne2000.c
-ne2000_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 +=
-#
-
-AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-
-$(PGM): $(ne2000_rel_OBJECTS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by
-# 	../wrapup/Makefile
-
-if HAS_NETWORKING
-all-local: $(ne2000_rel_OBJECTS) $(PGM)
-endif
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = ne2000.c
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/start/start.S b/c/src/lib/libbsp/i386/pc386/start/start.S
index 35369571bf..4d1a2bf9e8 100644
--- a/c/src/lib/libbsp/i386/pc386/start/start.S
+++ b/c/src/lib/libbsp/i386/pc386/start/start.S
@@ -145,8 +145,7 @@ SYM (zero_bss):
 	shrl	ecx
 	xorl	eax, eax		# value to clear out memory
 	repne				# while ecx != 0
-	stosl
-					#   clear a long in the bss
+	stosl				#   clear a long in the bss
 
 /*-------------------------------------------------------------------+
 | Initialize the video because zero_bss has cleared initVideo parameters
diff --git a/c/src/lib/libbsp/i386/pc386/startup/.cvsignore b/c/src/lib/libbsp/i386/pc386/startup/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/pc386/startup/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am
deleted file mode 100644
index 3cb267cce2..0000000000
--- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-## $Id$
-##
-
-VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../../shared/comm:@srcdir@/../../shared/pci
-
-PGM = $(ARCH)/startup.rel
-
-C_FILES = bsplibc.c bsppost.c bspstart.c exit.c idt.c irq.c irq_init.c \
-    bootcard.c main.c sbrk.c i386-stub.c i386-stub-glue.c uart.c pcibios.c \
-    gnatinstallhandler.c gdb_glue.c tty_drv.c
-
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-S_FILES = ldsegs.S irq_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(startup_rel_OBJECTS)
-	$(make-rel)
-
-project_lib_DATA = linkcmds
-
-all-local: $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
-
-EXTRA_DIST = bspstart.c exit.c ldsegs.S linkcmds sbrk.c
-
-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
diff --git a/c/src/lib/libbsp/i386/pc386/timer/.cvsignore b/c/src/lib/libbsp/i386/pc386/timer/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/pc386/timer/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am
deleted file mode 100644
index 42fd2aaa5e..0000000000
--- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/timer.rel
-
-C_FILES = timer.c
-S_FILES = timerisr.S
-timer_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 +=
-#
-
-$(PGM): $(timer_rel_OBJECTS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by
-# 	../wrapup/Makefile
-
-all-local: $(timer_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = timer.c timerisr.S
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/.cvsignore b/c/src/lib/libbsp/i386/pc386/wd8003/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/pc386/wd8003/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am
deleted file mode 100644
index f58672abb7..0000000000
--- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/wd8003.rel
-
-C_FILES = wd8003.c
-wd8003_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 +=
-#
-
-AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-
-$(PGM): $(wd8003_rel_OBJECTS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-
-if HAS_NETWORKING
-all-local: $(wd8003_rel_OBJECTS) $(PGM)
-endif
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = wd8003.c
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/.cvsignore b/c/src/lib/libbsp/i386/pc386/wrapup/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/pc386/wrapup/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am
deleted file mode 100644
index c326bbfd38..0000000000
--- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-# We only build the Network library if HAS_NETWORKING was defined
-# dec21140 is supported via libchip
-if HAS_NETWORKING
-NETWORK = ne2000 wd8003 3c509
-endif
-
-BSP_FILES = startup clock console timer $(NETWORK) ide
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
-    ../../../../libcpu/i386/cache$(LIB_VARIANT).rel \
-    ../../../../libcpu/i386/page$(LIB_VARIANT).rel \
-    ../../../../libcpu/i386/score$(LIB_VARIANT).rel
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-$(ARCH)/libbsp.a: $(OBJS)
-	$(make-library)
-
-noinst_DATA = $(ARCH)/libbsp.a
-
-include $(top_srcdir)/../../../../automake/local.am