2005-10-17 Ralf Corsepius <ralf.corsepius@rtems.org>

	* Makefile.am: Install/preinstall headers from ../../i386/shared.

6 files changed, 105 insertions, 17 deletions

diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index d269ae0d74..e9f86a055c 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Install/preinstall headers from ../../i386/shared.
+
 2005-09-19	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* network/network.c: Remove #define KERNEL.
@@ -32,7 +36,7 @@
 
 	* Makefile.am: Remove build-variant support.
 
-2004-09-24	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-09-24	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Require automake > 1.9.
 
@@ -44,40 +48,40 @@
 
 	* Makefile.am: Add -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ for network.
 
-2004-04-23	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-23	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	PR 610/bsps
 	* Makefile.am: Add include/tm27.h, Cosmetics.
 	* include/tm27.h: Final cosmetics.
 
-2004-04-22	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-22	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* include/bsp.h: Split out tmtest27 support.
 	* include/tm27.h: New.
 
-2004-04-21	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-21	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	PR 613/bsps
 	* include/bsp.h: Remove MAX_LONG_TEST_DURATION.
 
-2004-04-21	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-21	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	PR 614/bsps
 	* include/bsp.h: Remove MAX_SHORT_TEST_DURATION (Unused).
 
-2004-04-02	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-02	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* start/start.S: Include <rtems/asm.h> instead of <asm.h>.
 	* timer/timerisr.S: Include <rtems/asm.h> instead of <asm.h>.
 
-2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-01	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* network/network.c: Include <rtems/asm.h> instead of <asm.h>.
 	* include/bsp.h: Include <rtems/clockdrv.h> instead of <clockdrv.h>.
 	* include/bsp.h: Include <rtems/console.h> instead of <console.h>.
 	* include/bsp.h: Include <rtems/iosupp.h> instead of <iosupp.h>.
 
-2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-03-31	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* clock/ckinit.c, include/bsp.h, startup/bspstart.c, timer/timer.c:
 	Convert to using c99 fixed size types.
diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am
index f41b8b642b..9c7816469a 100644
--- a/c/src/lib/libbsp/i386/i386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am
@@ -19,6 +19,10 @@ noinst_PROGRAMS =
 
 include_HEADERS += include/coverhd.h
 
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = ../../i386/shared/irq/irq.h \
+    ../../i386/shared/irq/irq_asm.h
+
 noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc
 EXTRA_DIST = start/start.S
 start.$(OBJEXT): start/start.S
@@ -28,6 +32,7 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_PROGRAMS += startup.rel
+include_HEADERS += ../../i386/shared/comm/uart.h
 startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/main.c ../../shared/sbrk.c ../../i386/shared/irq/idt.c \
@@ -108,6 +113,19 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
+$(PROJECT_INCLUDE)/bsp/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
+	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+
+$(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_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
@@ -116,6 +134,10 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
 
+$(PROJECT_INCLUDE)/uart.h: ../../i386/shared/comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.h
+
 CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES += $(PREINSTALL_DIRS)
 CLEANFILES += $(TMPINSTALL_FILES)
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 66bd82fcab..f2a9ef9f96 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Install/preinstall headers from ../../i386/shared.
+
 2005-09-29	Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
 
 	PR 649/filesystem
@@ -103,7 +107,7 @@
 	PR 688/bsps
 	* Makefile.am clock/todcfg.c: Add support for MC146818A TOD chip.
 
-2004-09-24	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-09-24	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Require automake > 1.9.
 
@@ -125,45 +129,45 @@
 	* ne2000/ne2000.c, wd8003/wd8003.c: Include errno.h as a consequence of
 	recent updates to BSD header files.
 
-2004-04-23	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-23	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	PR 610/bsps
 	* Makefile.am: Add include/tm27.h, Cosmetics.
 	* include/tm27.h: Final cosmetics.
 
-2004-04-22	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-22	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* include/bsp.h: Split out tmtest27 support.
 	* include/tm27.h: New.
 
-2004-04-21	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-21	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	PR 613/bsps
 	* include/bsp.h: Remove MAX_LONG_TEST_DURATION.
 
-2004-04-21	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-21	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	PR 614/bsps
 	* include/bsp.h: Remove MAX_SHORT_TEST_DURATION (Unused).
 
-2004-04-14	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-14	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Add RTEMS_ROOT (HACK: This is the last file c/src
 	which still uses RTEMS_ROOT).
 
-2004-04-02	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-02	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* start/start.S: Include <rtems/asm.h> instead of <asm.h>.
 	* timer/timerisr.S: Include <rtems/asm.h> instead of <asm.h>.
 
-2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-04-01	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* startup/ldsegs.S: Include <rtems/asm.h> instead of <asm.h>.
 	* include/bsp.h: Include <rtems/clockdrv.h> instead of <clockdrv.h>.
 	* include/bsp.h: Include <rtems/console.h> instead of <console.h>.
 	* include/bsp.h: Include <rtems/iosupp.h> instead of <iosupp.h>.
 
-2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-03-31	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* clock/ckinit.c, clock/rtc.c, console/inch.c, ide/ide.c,
 	include/bsp.h, startup/bspstart.c, timer/timer.c: Convert to using
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index a1c5cc869a..1ced18f628 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -24,6 +24,10 @@ noinst_PROGRAMS =
 
 SUBDIRS = . tools
 
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = ../../i386/shared/irq/irq.h \
+    ../../i386/shared/irq/irq_asm.h
+
 include_HEADERS += include/crt.h
 nodist_include_HEADERS += ../../shared/include/coverhd.h
 
@@ -60,6 +64,7 @@ include_rtems_HEADERS = console/keyboard.h console/kd.h \
     console/serial_mouse.h console/ps2_drv.h console/fb_vga.h
 
 noinst_PROGRAMS += console.rel
+include_HEADERS += ../../i386/shared/comm/i386_io.h
 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 \
@@ -81,11 +86,13 @@ gnat_rel_CPPFLAGS = $(AM_CPPFLAGS)
 gnat_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_PROGRAMS += pci.rel
+include_HEADERS += ../../i386/shared/pci/pcibios.h
 pci_rel_SOURCES = ../../i386/shared/pci/pcibios.c
 pci_rel_CPPFLAGS = $(AM_CPPFLAGS)
 pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_PROGRAMS += startup.rel
+include_HEADERS += ../../i386/shared/comm/uart.h
 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 \
@@ -179,6 +186,19 @@ $(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/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
+	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+
+$(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)/crt.h: include/crt.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.h
@@ -224,6 +244,18 @@ $(PROJECT_INCLUDE)/rtems/fb_vga.h: console/fb_vga.h $(PROJECT_INCLUDE)/rtems/$(d
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb_vga.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb_vga.h
 
+$(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)/pcibios.h: ../../i386/shared/pci/pcibios.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pcibios.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/pcibios.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_NETWORKING
 $(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index 62527d50d5..e85618bae5 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-17	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Install/preinstall headers from ../../i386/shared.
+
 2005-09-19	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* network/ne2000.c: Include <errno.h> instead of <sys/errno.h>.
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
index 390b57f406..9e82841638 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
@@ -23,6 +23,10 @@ SUBDIRS = . tools
 
 include_HEADERS += include/coverhd.h
 
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = ../../i386/shared/irq/irq.h \
+    ../../i386/shared/irq/irq_asm.h
+
 noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc \
     start/ts_1325.inc
 EXTRA_DIST = start/start.S
@@ -34,6 +38,7 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_PROGRAMS += startup.rel
+include_HEADERS += ../../i386/shared/comm/uart.h
 startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/main.c ../../shared/sbrk.c ../../i386/shared/irq/idt.c \
@@ -117,6 +122,19 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
+$(PROJECT_INCLUDE)/bsp/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
+	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+
+$(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_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
@@ -125,6 +143,10 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
 
+$(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_NETWORKING
 $(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h