20 files changed, 13 insertions, 213 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/bsps/i386/pc386/include/bsp.h
index 4ff89527b2..4ff89527b2 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/bsps/i386/pc386/include/bsp.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/bspimpl.h b/bsps/i386/pc386/include/bsp/bspimpl.h
index 314fb91eb9..314fb91eb9 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bspimpl.h
+++ b/bsps/i386/pc386/include/bsp/bspimpl.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.h b/bsps/i386/pc386/include/bsp/exar17d15x.h
index 9e1194ffec..9e1194ffec 100644
--- a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.h
+++ b/bsps/i386/pc386/include/bsp/exar17d15x.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_default_mode.h b/bsps/i386/pc386/include/bsp/fb_default_mode.h
index 948ffee5b6..948ffee5b6 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_default_mode.h
+++ b/bsps/i386/pc386/include/bsp/fb_default_mode.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/fb_vesa.h b/bsps/i386/pc386/include/bsp/fb_vesa.h
index d8bfd1bcb4..d8bfd1bcb4 100644
--- a/c/src/lib/libbsp/i386/pc386/include/fb_vesa.h
+++ b/bsps/i386/pc386/include/bsp/fb_vesa.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/rtd316.h b/bsps/i386/pc386/include/bsp/rtd316.h
index aabad2c263..aabad2c263 100644
--- a/c/src/lib/libbsp/i386/pc386/console/rtd316.h
+++ b/bsps/i386/pc386/include/bsp/rtd316.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/tblsizes.h b/bsps/i386/pc386/include/bsp/tblsizes.h
index cea8619c8f..cea8619c8f 100644
--- a/c/src/lib/libbsp/i386/pc386/include/tblsizes.h
+++ b/bsps/i386/pc386/include/bsp/tblsizes.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/vbe3.h b/bsps/i386/pc386/include/bsp/vbe3.h
index b62ab6f3ac..b62ab6f3ac 100644
--- a/c/src/lib/libbsp/i386/pc386/include/vbe3.h
+++ b/bsps/i386/pc386/include/bsp/vbe3.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/crt.h b/bsps/i386/pc386/include/crt.h
index ba0534a5aa..ba0534a5aa 100644
--- a/c/src/lib/libbsp/i386/pc386/include/crt.h
+++ b/bsps/i386/pc386/include/crt.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/edid.h b/bsps/i386/pc386/include/edid.h
index 836294dcad..836294dcad 100644
--- a/c/src/lib/libbsp/i386/pc386/include/edid.h
+++ b/bsps/i386/pc386/include/edid.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/kd.h b/bsps/i386/pc386/include/rtems/kd.h
index c97e4f7bdd..c97e4f7bdd 100644
--- a/c/src/lib/libbsp/i386/pc386/console/kd.h
+++ b/bsps/i386/pc386/include/rtems/kd.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/keyboard.h b/bsps/i386/pc386/include/rtems/keyboard.h
index ffc8aabfbd..ffc8aabfbd 100644
--- a/c/src/lib/libbsp/i386/pc386/console/keyboard.h
+++ b/bsps/i386/pc386/include/rtems/keyboard.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h b/bsps/i386/pc386/include/rtems/ps2_drv.h
index 536b56a6ed..536b56a6ed 100644
--- a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h
+++ b/bsps/i386/pc386/include/rtems/ps2_drv.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/vgacons.h b/bsps/i386/pc386/include/rtems/vgacons.h
index df7615bf5e..df7615bf5e 100644
--- a/c/src/lib/libbsp/i386/pc386/console/vgacons.h
+++ b/bsps/i386/pc386/include/rtems/vgacons.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/tm27.h b/bsps/i386/pc386/include/tm27.h
index b53ab8e97a..b53ab8e97a 100644
--- a/c/src/lib/libbsp/i386/pc386/include/tm27.h
+++ b/bsps/i386/pc386/include/tm27.h
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index bf6412563f..0fc36a6cb9 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -12,38 +12,15 @@ CLEANFILES =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
 _SUBDIRS = . tools
 
-nodist_include_bsp_HEADERS += include/bspimpl.h
-include_bsp_HEADERS  = ../../i386/shared/irq/irq.h
-include_bsp_HEADERS += ../../i386/shared/irq/irq_asm.h
-include_bsp_HEADERS += ../../i386/shared/comm/tty_drv.h
-include_bsp_HEADERS += ../../i386/shared/realmode_int/realmode_int.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += console/rtd316.h
-include_bsp_HEADERS += console/exar17d15x.h
-include_bsp_HEADERS += include/tblsizes.h
-
-if HAS_SMP
-include_bsp_HEADERS += ../../i386/shared/irq/apic.h
-include_bsp_HEADERS += ../../i386/shared/smp/smp-imps.h
-endif
-
-include_HEADERS += include/crt.h
+TMPINSTALL_FILES =
 
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
@@ -63,9 +40,13 @@ start16.bin: start16-elf32.$(OBJEXT)
 	$(OBJCOPY) -O binary $< $@
 CLEANFILES += start16.bin
 
+$(PROJECT_LIB)/start16.bin: start16.bin $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/start16.bin
+TMPINSTALL_FILES += $(PROJECT_LIB)/start16.bin
+
 project_lib_DATA += start16.bin
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -76,14 +57,7 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 libbsp_a_SOURCES += clock/todcfg.c
 libbsp_a_SOURCES += ../../shared/tod.c
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS  =
-
 if RTEMS_VGA
-include_rtems_HEADERS += console/keyboard.h
-include_rtems_HEADERS += console/kd.h
-include_rtems_HEADERS += console/ps2_drv.h
-include_rtems_HEADERS += console/vgacons.h
 libbsp_a_SOURCES += console/inch.c
 libbsp_a_SOURCES += console/outch.c
 libbsp_a_SOURCES += console/defkeymap.c
@@ -95,7 +69,6 @@ libbsp_a_SOURCES += console/vt.c
 libbsp_a_SOURCES += console/videoAsm.S
 libbsp_a_SOURCES += console/kbd_parser.c
 libbsp_a_SOURCES += console/vgacons.c
-include_bsp_HEADERS += console/fb_default_mode.h
 if USE_VGA
 libbsp_a_SOURCES += console/fb_vga.c
 endif
@@ -103,15 +76,11 @@ if USE_CIRRUS_GD5446
 libbsp_a_SOURCES += console/fb_cirrus.c
 endif
 if USE_VBE_RM
-include_bsp_HEADERS += include/vbe3.h
-include_HEADERS += include/edid.h
-include_bsp_HEADERS += include/fb_vesa.h
 libbsp_a_SOURCES += console/fb_vesa_rm.c
 endif
 endif
 
 # console (non-graphics support)
-include_HEADERS += ../../i386/shared/comm/i386_io.h
 libbsp_a_SOURCES += console/serial_mouse_config.c
 libbsp_a_SOURCES += ../../i386/shared/comm/uart.c
 libbsp_a_SOURCES += ../../i386/shared/comm/tty_drv.c
@@ -142,7 +111,6 @@ libbsp_a_SOURCES += ../../i386/shared/pci/pci_io.c
 libbsp_a_SOURCES += ../../shared/pci/pci_bus_count.c
 libbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
 
-include_HEADERS += ../../i386/shared/comm/uart.h
 # startup
 libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
 libbsp_a_SOURCES += startup/bsp_fatal_halt.c
@@ -246,6 +214,6 @@ EXTRA_DIST += STATUS
 EXTRA_DIST += times_i486dx
 EXTRA_DIST += times_p5
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
 include $(top_srcdir)/../../../../automake/subdirs.am
+include $(srcdir)/../../../../../../bsps/i386/pc386/headers.am
diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac
index 83969b4f58..74cf64c493 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-i386-pc386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/pc386.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/i386/pc386/preinstall.am b/c/src/lib/libbsp/i386/pc386/preinstall.am
deleted file mode 100644
index 7476a70703..0000000000
--- a/c/src/lib/libbsp/i386/pc386/preinstall.am
+++ /dev/null
@@ -1,173 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES += $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/bspimpl.h: include/bspimpl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspimpl.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: ../../i386/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq_asm.h: ../../i386/shared/irq/irq_asm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_asm.h
-
-$(PROJECT_INCLUDE)/bsp/tty_drv.h: ../../i386/shared/comm/tty_drv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tty_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tty_drv.h
-
-$(PROJECT_INCLUDE)/bsp/realmode_int.h: ../../i386/shared/realmode_int/realmode_int.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/realmode_int.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/realmode_int.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/rtd316.h: console/rtd316.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rtd316.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rtd316.h
-
-$(PROJECT_INCLUDE)/bsp/exar17d15x.h: console/exar17d15x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/exar17d15x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/exar17d15x.h
-
-$(PROJECT_INCLUDE)/bsp/tblsizes.h: include/tblsizes.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tblsizes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tblsizes.h
-
-if HAS_SMP
-$(PROJECT_INCLUDE)/bsp/apic.h: ../../i386/shared/irq/apic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apic.h
-
-$(PROJECT_INCLUDE)/bsp/smp-imps.h: ../../i386/shared/smp/smp-imps.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/smp-imps.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/smp-imps.h
-endif
-$(PROJECT_INCLUDE)/crt.h: include/crt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/start16.bin: start16.bin $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start16.bin
-TMPINSTALL_FILES += $(PROJECT_LIB)/start16.bin
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-if RTEMS_VGA
-$(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/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/vgacons.h: console/vgacons.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vgacons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vgacons.h
-
-$(PROJECT_INCLUDE)/bsp/fb_default_mode.h: console/fb_default_mode.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fb_default_mode.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fb_default_mode.h
-
-if USE_VBE_RM
-$(PROJECT_INCLUDE)/bsp/vbe3.h: include/vbe3.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vbe3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vbe3.h
-
-$(PROJECT_INCLUDE)/edid.h: include/edid.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/edid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/edid.h
-
-$(PROJECT_INCLUDE)/bsp/fb_vesa.h: include/fb_vesa.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fb_vesa.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fb_vesa.h
-endif
-endif
-$(PROJECT_INCLUDE)/i386_io.h: ../../i386/shared/comm/i386_io.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i386_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i386_io.h
-
-$(PROJECT_INCLUDE)/uart.h: ../../i386/shared/comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.h
-
-if HAS_SMP
-$(PROJECT_LIB)/appstart.$(OBJEXT): appstart.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/appstart.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/appstart.$(OBJEXT)
-endif
diff --git a/c/src/lib/libbsp/i386/pc386/bsp_specs b/c/src/lib/libbsp/i386/pc386/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/i386/pc386/bsp_specs
+++ b/c/src/lib/libbsp/i386/pc386/startup/bsp_specs
diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.ac b/c/src/lib/libbsp/i386/pc386/tools/configure.ac
index 7824833bfc..7a7c981f60 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/tools/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-i386-pc386-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([Spec.doc])
 RTEMS_TOP(../../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 CFLAGS="-g -O2 -Wall"