FIXME Update Makefile.am with header.amno-preinstall

102 files changed, 204 insertions, 0 deletions

diff --git a/c/src/Makefile.am b/c/src/Makefile.am
index 08ec689f3f..a4dd3b357c 100644
--- a/c/src/Makefile.am
+++ b/c/src/Makefile.am
@@ -42,3 +42,5 @@ include $(DEPDIR)/cfg.P
 
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
+headersrcdir = ../../bsps
+include $(srcdir)/../../bsps/header.am
diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am
index 4d3c25877d..8700ae8509 100644
--- a/c/src/lib/libbsp/arm/Makefile.am
+++ b/c/src/lib/libbsp/arm/Makefile.am
@@ -17,3 +17,5 @@ EXTRA_DIST += shared/comm/uart.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/arm
+include $(srcdir)/../../../../../bsps/arm/header.am
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
index e1f67b7e47..b4cf9ba9e1 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -145,3 +145,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/arm-l2c-310
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/altera-cyclone-v
+include $(srcdir)/../../../../../../bsps/arm/altera-cyclone-v/header.am
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index 8d256bc156..b0f9412b0c 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -176,3 +176,5 @@ libbsp_a_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/bsps/arm/atsam/include/libchip/inclu
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/atsam
+include $(srcdir)/../../../../../../bsps/arm/atsam/header.am
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index bbca3df626..4923197882 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -109,3 +109,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/beagle
+include $(srcdir)/../../../../../../bsps/arm/beagle/header.am
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 40987396d2..d026bdbc62 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -65,3 +65,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/csb336
+include $(srcdir)/../../../../../../bsps/arm/csb336/header.am
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 232e20c329..ef2d970d46 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -95,3 +95,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/csb337
+include $(srcdir)/../../../../../../bsps/arm/csb337/header.am
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index d37714a66e..308861f7e2 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -69,3 +69,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/edb7312
+include $(srcdir)/../../../../../../bsps/arm/edb7312/header.am
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index 899a330359..85a24e7fa0 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -66,3 +66,5 @@ libbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/gdbarmsim
+include $(srcdir)/../../../../../../bsps/arm/gdbarmsim/header.am
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index a052bc5e58..2de1261ef7 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -71,3 +71,5 @@ endif
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/gumstix
+include $(srcdir)/../../../../../../bsps/arm/gumstix/header.am
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index 53ccbcee14..5d8c1aae0f 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -97,3 +97,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/imx
+include $(srcdir)/../../../../../../bsps/arm/imx/header.am
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index 88ef703c32..4b077c9015 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -95,3 +95,5 @@ libbsp_a_SOURCES += ssi/ssi.c
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/lm3s69xx
+include $(srcdir)/../../../../../../bsps/arm/lm3s69xx/header.am
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 154cfa354f..9ecf73498b 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -129,3 +129,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/lpc176x
+include $(srcdir)/../../../../../../bsps/arm/lpc176x/header.am
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index e0d240e33e..f5fc58bf4f 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -155,3 +155,5 @@ endif
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/lpc24xx
+include $(srcdir)/../../../../../../bsps/arm/lpc24xx/header.am
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index c3a6f67550..03aba1647c 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -135,3 +135,5 @@ endif
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/lpc32xx
+include $(srcdir)/../../../../../../bsps/arm/lpc32xx/header.am
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 5302a8f473..cd76afd203 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -152,3 +152,5 @@ libbsp_a_SOURCES += ../shared/mminit.c
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/raspberrypi
+include $(srcdir)/../../../../../../bsps/arm/raspberrypi/header.am
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
index b4032eae08..b46765e105 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -104,3 +104,5 @@ libbsp_a_SOURCES += startup/fb-config.c
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/realview-pbx-a9
+include $(srcdir)/../../../../../../bsps/arm/realview-pbx-a9/header.am
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index 78593d0c13..a3594b9a74 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -67,3 +67,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/rtl22xx
+include $(srcdir)/../../../../../../bsps/arm/rtl22xx/header.am
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index eab419ec36..61c0c49055 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -66,3 +66,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/smdk2410
+include $(srcdir)/../../../../../../bsps/arm/smdk2410/header.am
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index dbf714320e..d88dbe7848 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -96,3 +96,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../../../libcpu/arm/shared/include
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/stm32f4
+include $(srcdir)/../../../../../../bsps/arm/stm32f4/header.am
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 6ec697f511..be67cde2aa 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -128,3 +128,5 @@ endif
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/tms570
+include $(srcdir)/../../../../../../bsps/arm/tms570/header.am
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 95c4b81580..910fa09157 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -99,3 +99,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c startup/bspstartmmu.c
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/arm/xilinx-zynq
+include $(srcdir)/../../../../../../bsps/arm/xilinx-zynq/header.am
diff --git a/c/src/lib/libbsp/bfin/Makefile.am b/c/src/lib/libbsp/bfin/Makefile.am
index c25b2d3f99..ab5c0bb4b7 100644
--- a/c/src/lib/libbsp/bfin/Makefile.am
+++ b/c/src/lib/libbsp/bfin/Makefile.am
@@ -5,3 +5,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/bfin
+include $(srcdir)/../../../../../bsps/bfin/header.am
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index de610e62fb..2e11475ca6 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
@@ -41,3 +41,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/bfin/TLL6527M
+include $(srcdir)/../../../../../../bsps/bfin/TLL6527M/header.am
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index 8341b2d4ee..f4240cf9b9 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -53,3 +53,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/bfin/bf537Stamp
+include $(srcdir)/../../../../../../bsps/bfin/bf537Stamp/header.am
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index 6b0993fc79..be012beebf 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -42,3 +42,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/bfin/eZKit533
+include $(srcdir)/../../../../../../bsps/bfin/eZKit533/header.am
diff --git a/c/src/lib/libbsp/epiphany/Makefile.am b/c/src/lib/libbsp/epiphany/Makefile.am
index 427e0018c8..99a604e3b0 100644
--- a/c/src/lib/libbsp/epiphany/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/Makefile.am
@@ -5,3 +5,5 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/epiphany
+include $(srcdir)/../../../../../bsps/epiphany/header.am
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index a8470d8081..7903afba1f 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -72,3 +72,5 @@ libbsp_a_SOURCES += console/console-io.c
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/epiphany/epiphany_sim
+include $(srcdir)/../../../../../../bsps/epiphany/epiphany_sim/header.am
diff --git a/c/src/lib/libbsp/i386/Makefile.am b/c/src/lib/libbsp/i386/Makefile.am
index 959646762f..0f4af04ab3 100644
--- a/c/src/lib/libbsp/i386/Makefile.am
+++ b/c/src/lib/libbsp/i386/Makefile.am
@@ -27,3 +27,5 @@ EXTRA_DIST += shared/pci/pci_io.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/i386
+include $(srcdir)/../../../../../bsps/i386/header.am
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 3c8ca95783..543b710acc 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -219,3 +219,5 @@ EXTRA_DIST += times_p5
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(top_srcdir)/../../../../automake/subdirs.am
+headersrcdir = ../../../../../../bsps/i386/pc386
+include $(srcdir)/../../../../../../bsps/i386/pc386/header.am
diff --git a/c/src/lib/libbsp/lm32/Makefile.am b/c/src/lib/libbsp/lm32/Makefile.am
index c25b2d3f99..f777baacc8 100644
--- a/c/src/lib/libbsp/lm32/Makefile.am
+++ b/c/src/lib/libbsp/lm32/Makefile.am
@@ -5,3 +5,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/lm32
+include $(srcdir)/../../../../../bsps/lm32/header.am
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index e34b9b20a5..e4adf3763d 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -55,3 +55,5 @@ endif
 
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/lm32/lm32_evr
+include $(srcdir)/../../../../../../bsps/lm32/lm32_evr/header.am
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index 232beeab01..432cf9f2e0 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -101,3 +101,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/lm32/milkymist
+include $(srcdir)/../../../../../../bsps/lm32/milkymist/header.am
diff --git a/c/src/lib/libbsp/m32c/Makefile.am b/c/src/lib/libbsp/m32c/Makefile.am
index e99d8df18f..c5b3bfbafd 100644
--- a/c/src/lib/libbsp/m32c/Makefile.am
+++ b/c/src/lib/libbsp/m32c/Makefile.am
@@ -7,3 +7,5 @@ EXTRA_DIST =
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/m32c
+include $(srcdir)/../../../../../bsps/m32c/header.am
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index b37208939a..b84e465023 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -39,3 +39,5 @@ libbsp_a_SOURCES += ../../shared/include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m32c/m32cbsp
+include $(srcdir)/../../../../../../bsps/m32c/m32cbsp/header.am
diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am
index 649f528043..297d3d0177 100644
--- a/c/src/lib/libbsp/m68k/Makefile.am
+++ b/c/src/lib/libbsp/m68k/Makefile.am
@@ -15,3 +15,5 @@ EXTRA_DIST += shared/gdbstub/m68k-stub.c shared/gdbstub/gdb_if.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/m68k
+include $(srcdir)/../../../../../bsps/m68k/header.am
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index b1c080b63c..c58f40816a 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -53,3 +53,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/av5282
+include $(srcdir)/../../../../../../bsps/m68k/av5282/header.am
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index 086efda8c9..4bda604829 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -44,3 +44,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/csb360
+include $(srcdir)/../../../../../../bsps/m68k/csb360/header.am
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index 7d7ace6ae2..51df057e1f 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -42,3 +42,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/gen68340
+include $(srcdir)/../../../../../../bsps/m68k/gen68340/header.am
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index d65e1d11fb..730cdc5f68 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -55,3 +55,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/gen68360
+include $(srcdir)/../../../../../../bsps/m68k/gen68360/header.am
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index a1a4dfab0d..3c7bbe8375 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -70,3 +70,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/genmcf548x
+include $(srcdir)/../../../../../../bsps/m68k/genmcf548x/header.am
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 43d61f6a66..cec1901405 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -56,3 +56,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mcf5206elite
+include $(srcdir)/../../../../../../bsps/m68k/mcf5206elite/header.am
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index e553b6c598..bef1f6d4f8 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -44,3 +44,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mcf52235
+include $(srcdir)/../../../../../../bsps/m68k/mcf52235/header.am
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index bf18d08b62..1ac2cebbee 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -39,3 +39,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mcf5225x
+include $(srcdir)/../../../../../../bsps/m68k/mcf5225x/header.am
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index b34b311124..0e8f626f05 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -56,3 +56,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mcf5235
+include $(srcdir)/../../../../../../bsps/m68k/mcf5235/header.am
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index 4fb7bf0d74..6a2768fa4e 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -55,3 +55,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mcf5329
+include $(srcdir)/../../../../../../bsps/m68k/mcf5329/header.am
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 4412dacac1..fd8a26441e 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -43,3 +43,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mrm332
+include $(srcdir)/../../../../../../bsps/m68k/mrm332/header.am
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 99fc8d4f3b..d19208ad56 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -44,3 +44,5 @@ libbsp_a_LIBADD = \
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mvme147
+include $(srcdir)/../../../../../../bsps/m68k/mvme147/header.am
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index abf29bd882..ccbb0bf113 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -52,3 +52,5 @@ libbsp_a_LIBADD = \
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mvme147s
+include $(srcdir)/../../../../../../bsps/m68k/mvme147s/header.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index e97a74156d..179b88b67c 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -61,3 +61,5 @@ endif
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mvme162
+include $(srcdir)/../../../../../../bsps/m68k/mvme162/header.am
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index d0fdbf2228..8655b00785 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -56,3 +56,5 @@ endif
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/mvme167
+include $(srcdir)/../../../../../../bsps/m68k/mvme167/header.am
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 95b0122c83..797d343ea6 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -51,3 +51,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/m68k/uC5282
+include $(srcdir)/../../../../../../bsps/m68k/uC5282/header.am
diff --git a/c/src/lib/libbsp/mips/Makefile.am b/c/src/lib/libbsp/mips/Makefile.am
index 526453030c..083b5f55aa 100644
--- a/c/src/lib/libbsp/mips/Makefile.am
+++ b/c/src/lib/libbsp/mips/Makefile.am
@@ -5,3 +5,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/mips
+include $(srcdir)/../../../../../bsps/mips/header.am
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index 9a45bcef3a..2a96d2a7ce 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -65,3 +65,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/mips/csb350
+include $(srcdir)/../../../../../../bsps/mips/csb350/header.am
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index a0e1c3b8bd..e2281c6323 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -60,3 +60,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rm52xx/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/mips/hurricane
+include $(srcdir)/../../../../../../bsps/mips/hurricane/header.am
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 1e384ae80a..4ab4eaaea4 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -51,3 +51,5 @@ libbsp_a_LIBADD  = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/mips/jmr3904
+include $(srcdir)/../../../../../../bsps/mips/jmr3904/header.am
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index 990bf52b67..d4d6305351 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -74,3 +74,5 @@ libbsp_a_SOURCES += irq/interruptmask.c
 libbsp_a_SOURCES += ../shared/irq/i8259.c
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/mips/malta
+include $(srcdir)/../../../../../../bsps/mips/malta/header.am
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index 882a0abee5..f202eb337d 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -60,3 +60,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/mips/rbtx4925
+include $(srcdir)/../../../../../../bsps/mips/rbtx4925/header.am
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index 882a0abee5..dd1ae6aab1 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -60,3 +60,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/mips/rbtx4938
+include $(srcdir)/../../../../../../bsps/mips/rbtx4938/header.am
diff --git a/c/src/lib/libbsp/moxie/Makefile.am b/c/src/lib/libbsp/moxie/Makefile.am
index 3caad19373..bfd278c4f7 100644
--- a/c/src/lib/libbsp/moxie/Makefile.am
+++ b/c/src/lib/libbsp/moxie/Makefile.am
@@ -9,3 +9,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/moxie
+include $(srcdir)/../../../../../bsps/moxie/header.am
diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index d4c8bcbdcd..e2ac9ed33c 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -47,3 +47,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/moxie/moxiesim
+include $(srcdir)/../../../../../../bsps/moxie/moxiesim/header.am
diff --git a/c/src/lib/libbsp/nios2/Makefile.am b/c/src/lib/libbsp/nios2/Makefile.am
index c25b2d3f99..bec3c424b4 100644
--- a/c/src/lib/libbsp/nios2/Makefile.am
+++ b/c/src/lib/libbsp/nios2/Makefile.am
@@ -5,3 +5,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/nios2
+include $(srcdir)/../../../../../bsps/nios2/header.am
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index 5b5dce97dc..1fe6bf4eb2 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -47,3 +47,5 @@ libbsp_a_SOURCES += timer/timer.c
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/nios2/nios2_iss
+include $(srcdir)/../../../../../../bsps/nios2/nios2_iss/header.am
diff --git a/c/src/lib/libbsp/no_cpu/Makefile.am b/c/src/lib/libbsp/no_cpu/Makefile.am
index c25b2d3f99..0c9a56e0a1 100644
--- a/c/src/lib/libbsp/no_cpu/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/Makefile.am
@@ -5,3 +5,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/no_cpu
+include $(srcdir)/../../../../../bsps/no_cpu/header.am
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
index 3378e462e8..41bbbdd36f 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -35,3 +35,5 @@ libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/no_cpu/no_bsp
+include $(srcdir)/../../../../../../bsps/no_cpu/no_bsp/header.am
diff --git a/c/src/lib/libbsp/or1k/Makefile.am b/c/src/lib/libbsp/or1k/Makefile.am
index 2ac3c98e2c..95b2715b7f 100644
--- a/c/src/lib/libbsp/or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/Makefile.am
@@ -7,3 +7,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/or1k
+include $(srcdir)/../../../../../bsps/or1k/header.am
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index 56860eeb93..1bc904b4cb 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -83,3 +83,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/or1k/generic_or1k
+include $(srcdir)/../../../../../../bsps/or1k/generic_or1k/header.am
diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am
index 1309072f53..2e86b9c8c4 100644
--- a/c/src/lib/libbsp/powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/Makefile.am
@@ -69,3 +69,5 @@ EXTRA_DIST += shared/vme/vmeconfig.c shared/vme/VMEConfig.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/powerpc
+include $(srcdir)/../../../../../bsps/powerpc/header.am
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index f6ead60aab..c8439bca87 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -182,3 +182,5 @@ endif
 EXTRA_DIST += README LICENSE
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/beatnik
+include $(srcdir)/../../../../../../bsps/powerpc/beatnik/header.am
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index d62850e41a..ca470b97fd 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -119,3 +119,5 @@ libbsp_a_LIBADD =  ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/gen5200
+include $(srcdir)/../../../../../../bsps/powerpc/gen5200/header.am
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 8fd21a7790..24e5b433af 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -99,3 +99,5 @@ endif
 EXTRA_DIST += README.mpc8349eamds
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/gen83xx
+include $(srcdir)/../../../../../../bsps/powerpc/gen83xx/header.am
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 7fe4250582..137250a699 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -59,3 +59,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/haleakala
+include $(srcdir)/../../../../../../bsps/powerpc/haleakala/header.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 209a846e03..3f3d79b867 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -147,3 +147,5 @@ EXTRA_DIST += times.mcp750 times.mvme2307
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(top_srcdir)/../../../../automake/subdirs.am
+headersrcdir = ../../../../../../bsps/powerpc/motorola_powerpc
+include $(srcdir)/../../../../../../bsps/powerpc/motorola_powerpc/header.am
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 545fb58e6d..7232e92325 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -120,3 +120,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/mpc55xxevb
+include $(srcdir)/../../../../../../bsps/powerpc/mpc55xxevb/header.am
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 6d1e2c5da5..4949b4d647 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -73,3 +73,5 @@ endif
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/mpc8260ads
+include $(srcdir)/../../../../../../bsps/powerpc/mpc8260ads/header.am
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index ea34da4146..91f90ef204 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -122,3 +122,5 @@ endif
 EXTRA_DIST += LICENSE README KNOWN_PROBLEMS
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/mvme3100
+include $(srcdir)/../../../../../../bsps/powerpc/mvme3100/header.am
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index ff2dba5970..d4220e0e70 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -100,3 +100,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/mvme5500
+include $(srcdir)/../../../../../../bsps/powerpc/mvme5500/header.am
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index c49187112e..aab8b4ee05 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -72,3 +72,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/psim
+include $(srcdir)/../../../../../../bsps/powerpc/psim/header.am
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index fbafac77de..8966d960fa 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -60,3 +60,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/qemuppc
+include $(srcdir)/../../../../../../bsps/powerpc/qemuppc/header.am
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index fa5e434615..dee585ed5d 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -113,3 +113,5 @@ libbsp_a_SOURCES += startup/bspsmp.c
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/qoriq
+include $(srcdir)/../../../../../../bsps/powerpc/qoriq/header.am
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 2a673c3e6f..1fef6b9920 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -47,3 +47,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mpc5xx/vectors.rel
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/ss555
+include $(srcdir)/../../../../../../bsps/powerpc/ss555/header.am
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index e0738657ab..4e3a0a1fbf 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -74,3 +74,5 @@ libbsp_a_SOURCES += ../../shared/bspsmp.c
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/t32mppc
+include $(srcdir)/../../../../../../bsps/powerpc/t32mppc/header.am
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 2f3dc8e8c3..93c876f8c6 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -81,3 +81,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/tqm8xx
+include $(srcdir)/../../../../../../bsps/powerpc/tqm8xx/header.am
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index e6e4211b5b..9c32172263 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -82,3 +82,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/virtex
+include $(srcdir)/../../../../../../bsps/powerpc/virtex/header.am
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index d1cb948621..c82f3b00de 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -55,3 +55,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/virtex4
+include $(srcdir)/../../../../../../bsps/powerpc/virtex4/header.am
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index d92534130c..6a434c814f 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -57,3 +57,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/powerpc/virtex5
+include $(srcdir)/../../../../../../bsps/powerpc/virtex5/header.am
diff --git a/c/src/lib/libbsp/riscv/Makefile.am b/c/src/lib/libbsp/riscv/Makefile.am
index 574ae94411..fb7966600f 100644
--- a/c/src/lib/libbsp/riscv/Makefile.am
+++ b/c/src/lib/libbsp/riscv/Makefile.am
@@ -8,3 +8,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/riscv
+include $(srcdir)/../../../../../bsps/riscv/header.am
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index 43559dd352..d50ec865d4 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
@@ -73,3 +73,5 @@ libbsp_a_SOURCES += console/console-io.c
 DISTCLEANFILES = include/bspopts.h
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/riscv/riscv_generic
+include $(srcdir)/../../../../../../bsps/riscv/riscv_generic/header.am
diff --git a/c/src/lib/libbsp/sh/Makefile.am b/c/src/lib/libbsp/sh/Makefile.am
index 35db1bb6fa..d6007b54c9 100644
--- a/c/src/lib/libbsp/sh/Makefile.am
+++ b/c/src/lib/libbsp/sh/Makefile.am
@@ -9,3 +9,5 @@ EXTRA_DIST += shared/setvec.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/sh
+include $(srcdir)/../../../../../bsps/sh/header.am
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index 7cff5ef750..e96ad10353 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -54,3 +54,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sh/gensh1
+include $(srcdir)/../../../../../../bsps/sh/gensh1/header.am
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index 8d3c45eee0..cdd1dc0ee7 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -54,3 +54,5 @@ libbsp_a_SOURCES += ../../shared/include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sh/gensh2
+include $(srcdir)/../../../../../../bsps/sh/gensh2/header.am
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index bcaef8b390..fc98253e8f 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -43,3 +43,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sh/gensh4
+include $(srcdir)/../../../../../../bsps/sh/gensh4/header.am
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index bbd544c3bf..1fc9f7e2bc 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -52,3 +52,5 @@ libbsp_a_SOURCES += ../../shared/include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sh/shsim
+include $(srcdir)/../../../../../../bsps/sh/shsim/header.am
diff --git a/c/src/lib/libbsp/sparc/Makefile.am b/c/src/lib/libbsp/sparc/Makefile.am
index 30ea8497b5..a56ca85870 100644
--- a/c/src/lib/libbsp/sparc/Makefile.am
+++ b/c/src/lib/libbsp/sparc/Makefile.am
@@ -191,3 +191,5 @@ EXTRA_DIST += shared/include/l4stat.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/sparc
+include $(srcdir)/../../../../../bsps/sparc/header.am
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index ca21e84dfc..b6eebb1526 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -91,3 +91,5 @@ endif
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sparc/erc32
+include $(srcdir)/../../../../../../bsps/sparc/erc32/header.am
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index cf0bdd3fa9..9c2fa6f876 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -210,3 +210,5 @@ endif
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sparc/leon2
+include $(srcdir)/../../../../../../bsps/sparc/leon2/header.am
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index b939501116..7ae79b5b86 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -241,3 +241,5 @@ endif
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sparc/leon3
+include $(srcdir)/../../../../../../bsps/sparc/leon3/header.am
diff --git a/c/src/lib/libbsp/sparc64/Makefile.am b/c/src/lib/libbsp/sparc64/Makefile.am
index 526453030c..27acd33bc5 100644
--- a/c/src/lib/libbsp/sparc64/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/Makefile.am
@@ -5,3 +5,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/sparc64
+include $(srcdir)/../../../../../bsps/sparc64/header.am
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index 2dcfa75b4f..d1ca8e4eaa 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -56,3 +56,5 @@ libbsp_a_LIBADD = \
       ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel 
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sparc64/niagara
+include $(srcdir)/../../../../../../bsps/sparc64/niagara/header.am
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 0d404e3e96..848ed4135b 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -70,3 +70,5 @@ libbsp_a_LIBADD = \
       ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel 
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/sparc64/usiii
+include $(srcdir)/../../../../../../bsps/sparc64/usiii/header.am
diff --git a/c/src/lib/libbsp/v850/Makefile.am b/c/src/lib/libbsp/v850/Makefile.am
index 169d11d284..d9ba9a1963 100644
--- a/c/src/lib/libbsp/v850/Makefile.am
+++ b/c/src/lib/libbsp/v850/Makefile.am
@@ -12,3 +12,5 @@ EXTRA_DIST =
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+headersrcdir = ../../../../../bsps/v850
+include $(srcdir)/../../../../../bsps/v850/header.am
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index 72959a5777..4efe9f6774 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -45,3 +45,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 noinst_LIBRARIES = libbsp.a
 
 include $(top_srcdir)/../../../../automake/local.am
+headersrcdir = ../../../../../../bsps/v850/gdbv850sim
+include $(srcdir)/../../../../../../bsps/v850/gdbv850sim/header.am