[rtems commit] build: Remove local.am

Sebastian Huber sebh at rtems.org
Wed Oct 10 12:04:36 UTC 2018


Module:    rtems
Branch:    master
Commit:    477bca2d6132f582b062706a471ea5136d7c935b
Changeset: http://git.rtems.org/rtems/commit/?id=477bca2d6132f582b062706a471ea5136d7c935b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Sat Oct  6 10:59:10 2018 +0200

build: Remove local.am

---

 automake/local.am                                                  | 3 ---
 c/src/Makefile.am                                                  | 1 -
 c/src/automake/local.am                                            | 3 ---
 c/src/lib/libbsp/Makefile.am                                       | 1 -
 c/src/lib/libbsp/arm/Makefile.am                                   | 1 -
 c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am                  | 1 -
 c/src/lib/libbsp/arm/atsam/Makefile.am                             | 1 -
 c/src/lib/libbsp/arm/beagle/Makefile.am                            | 1 -
 c/src/lib/libbsp/arm/csb336/Makefile.am                            | 1 -
 c/src/lib/libbsp/arm/csb337/Makefile.am                            | 1 -
 c/src/lib/libbsp/arm/edb7312/Makefile.am                           | 1 -
 c/src/lib/libbsp/arm/gdbarmsim/Makefile.am                         | 1 -
 c/src/lib/libbsp/arm/gumstix/Makefile.am                           | 1 -
 c/src/lib/libbsp/arm/imx/Makefile.am                               | 1 -
 c/src/lib/libbsp/arm/lm3s69xx/Makefile.am                          | 1 -
 c/src/lib/libbsp/arm/lpc176x/Makefile.am                           | 1 -
 c/src/lib/libbsp/arm/lpc24xx/Makefile.am                           | 1 -
 c/src/lib/libbsp/arm/lpc32xx/Makefile.am                           | 1 -
 c/src/lib/libbsp/arm/raspberrypi/Makefile.am                       | 1 -
 c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am                   | 1 -
 c/src/lib/libbsp/arm/rtl22xx/Makefile.am                           | 1 -
 c/src/lib/libbsp/arm/smdk2410/Makefile.am                          | 1 -
 c/src/lib/libbsp/arm/stm32f4/Makefile.am                           | 1 -
 c/src/lib/libbsp/arm/tms570/Makefile.am                            | 1 -
 c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am                       | 1 -
 c/src/lib/libbsp/bfin/Makefile.am                                  | 1 -
 c/src/lib/libbsp/bfin/TLL6527M/Makefile.am                         | 1 -
 c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am                       | 1 -
 c/src/lib/libbsp/bfin/eZKit533/Makefile.am                         | 1 -
 c/src/lib/libbsp/epiphany/Makefile.am                              | 1 -
 c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am                 | 1 -
 c/src/lib/libbsp/i386/Makefile.am                                  | 1 -
 c/src/lib/libbsp/i386/pc386/Makefile.am                            | 1 -
 c/src/lib/libbsp/lm32/Makefile.am                                  | 1 -
 c/src/lib/libbsp/lm32/lm32_evr/Makefile.am                         | 1 -
 c/src/lib/libbsp/lm32/milkymist/Makefile.am                        | 1 -
 c/src/lib/libbsp/m32c/Makefile.am                                  | 1 -
 c/src/lib/libbsp/m32c/m32cbsp/Makefile.am                          | 1 -
 c/src/lib/libbsp/m68k/Makefile.am                                  | 1 -
 c/src/lib/libbsp/m68k/av5282/Makefile.am                           | 1 -
 c/src/lib/libbsp/m68k/csb360/Makefile.am                           | 1 -
 c/src/lib/libbsp/m68k/gen68340/Makefile.am                         | 1 -
 c/src/lib/libbsp/m68k/gen68360/Makefile.am                         | 1 -
 c/src/lib/libbsp/m68k/genmcf548x/Makefile.am                       | 1 -
 c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am                     | 1 -
 c/src/lib/libbsp/m68k/mcf52235/Makefile.am                         | 1 -
 c/src/lib/libbsp/m68k/mcf5225x/Makefile.am                         | 1 -
 c/src/lib/libbsp/m68k/mcf5235/Makefile.am                          | 1 -
 c/src/lib/libbsp/m68k/mcf5329/Makefile.am                          | 1 -
 c/src/lib/libbsp/m68k/mrm332/Makefile.am                           | 1 -
 c/src/lib/libbsp/m68k/mvme147/Makefile.am                          | 1 -
 c/src/lib/libbsp/m68k/mvme147s/Makefile.am                         | 1 -
 c/src/lib/libbsp/m68k/mvme162/Makefile.am                          | 1 -
 c/src/lib/libbsp/m68k/mvme167/Makefile.am                          | 1 -
 c/src/lib/libbsp/m68k/uC5282/Makefile.am                           | 1 -
 c/src/lib/libbsp/mips/Makefile.am                                  | 1 -
 c/src/lib/libbsp/mips/csb350/Makefile.am                           | 1 -
 c/src/lib/libbsp/mips/hurricane/Makefile.am                        | 1 -
 c/src/lib/libbsp/mips/jmr3904/Makefile.am                          | 1 -
 c/src/lib/libbsp/mips/malta/Makefile.am                            | 1 -
 c/src/lib/libbsp/mips/rbtx4925/Makefile.am                         | 1 -
 c/src/lib/libbsp/mips/rbtx4938/Makefile.am                         | 1 -
 c/src/lib/libbsp/moxie/Makefile.am                                 | 1 -
 c/src/lib/libbsp/moxie/moxiesim/Makefile.am                        | 1 -
 c/src/lib/libbsp/nios2/Makefile.am                                 | 1 -
 c/src/lib/libbsp/nios2/nios2_iss/Makefile.am                       | 1 -
 c/src/lib/libbsp/no_cpu/Makefile.am                                | 1 -
 c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am                         | 1 -
 c/src/lib/libbsp/or1k/Makefile.am                                  | 1 -
 c/src/lib/libbsp/or1k/generic_or1k/Makefile.am                     | 1 -
 c/src/lib/libbsp/powerpc/Makefile.am                               | 1 -
 c/src/lib/libbsp/powerpc/beatnik/Makefile.am                       | 1 -
 c/src/lib/libbsp/powerpc/gen5200/Makefile.am                       | 1 -
 c/src/lib/libbsp/powerpc/gen83xx/Makefile.am                       | 1 -
 c/src/lib/libbsp/powerpc/haleakala/Makefile.am                     | 1 -
 c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am              | 1 -
 c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am   | 1 -
 c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am | 1 -
 c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am                    | 1 -
 c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am                    | 1 -
 c/src/lib/libbsp/powerpc/mvme3100/Makefile.am                      | 1 -
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am                      | 1 -
 c/src/lib/libbsp/powerpc/psim/Makefile.am                          | 1 -
 c/src/lib/libbsp/powerpc/qemuppc/Makefile.am                       | 1 -
 c/src/lib/libbsp/powerpc/qoriq/Makefile.am                         | 1 -
 c/src/lib/libbsp/powerpc/ss555/Makefile.am                         | 1 -
 c/src/lib/libbsp/powerpc/t32mppc/Makefile.am                       | 1 -
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am                        | 1 -
 c/src/lib/libbsp/powerpc/virtex/Makefile.am                        | 1 -
 c/src/lib/libbsp/powerpc/virtex4/Makefile.am                       | 1 -
 c/src/lib/libbsp/powerpc/virtex5/Makefile.am                       | 1 -
 c/src/lib/libbsp/riscv/Makefile.am                                 | 1 -
 c/src/lib/libbsp/riscv/riscv/Makefile.am                           | 1 -
 c/src/lib/libbsp/sh/Makefile.am                                    | 1 -
 c/src/lib/libbsp/sh/gensh1/Makefile.am                             | 1 -
 c/src/lib/libbsp/sh/gensh2/Makefile.am                             | 1 -
 c/src/lib/libbsp/sh/gensh4/Makefile.am                             | 1 -
 c/src/lib/libbsp/sh/shsim/Makefile.am                              | 1 -
 c/src/lib/libbsp/sparc/Makefile.am                                 | 1 -
 c/src/lib/libbsp/sparc/erc32/Makefile.am                           | 1 -
 c/src/lib/libbsp/sparc/leon2/Makefile.am                           | 1 -
 c/src/lib/libbsp/sparc/leon3/Makefile.am                           | 1 -
 c/src/lib/libbsp/sparc64/Makefile.am                               | 1 -
 c/src/lib/libbsp/sparc64/niagara/Makefile.am                       | 1 -
 c/src/lib/libbsp/sparc64/usiii/Makefile.am                         | 1 -
 c/src/lib/libbsp/v850/Makefile.am                                  | 1 -
 c/src/lib/libbsp/v850/gdbv850sim/Makefile.am                       | 1 -
 c/src/lib/libbsp/x86_64/Makefile.am                                | 1 -
 c/src/lib/libbsp/x86_64/amd64/Makefile.am                          | 1 -
 c/src/make/Makefile.am                                             | 1 -
 cpukit/Makefile.am                                                 | 1 -
 cpukit/automake/local.am                                           | 2 --
 cpukit/score/cpu/Makefile.am                                       | 1 -
 testsuites/Makefile.am                                             | 1 -
 testsuites/ada/Makefile.am                                         | 1 -
 testsuites/ada/mptests/Makefile.am                                 | 1 -
 testsuites/ada/mptests/mp01/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp01/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp01/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp03/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp03/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp03/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp04/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp04/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp04/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp05/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp05/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp05/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp06/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp06/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp06/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp07/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp07/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp07/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp08/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp08/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp08/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp09/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp09/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp09/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp10/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp10/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp10/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp11/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp11/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp11/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp12/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp12/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp12/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp13/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp13/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp13/node2/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp14/Makefile.am                            | 1 -
 testsuites/ada/mptests/mp14/node1/Makefile.am                      | 1 -
 testsuites/ada/mptests/mp14/node2/Makefile.am                      | 1 -
 testsuites/ada/samples/Makefile.am                                 | 1 -
 testsuites/ada/samples/base_mp/Makefile.am                         | 1 -
 testsuites/ada/samples/base_mp/node1/Makefile.am                   | 1 -
 testsuites/ada/samples/base_mp/node2/Makefile.am                   | 1 -
 testsuites/ada/samples/base_sp/Makefile.am                         | 1 -
 testsuites/ada/samples/hello/Makefile.am                           | 1 -
 testsuites/ada/samples/nsecs/Makefile.am                           | 1 -
 testsuites/ada/samples/ticker/Makefile.am                          | 1 -
 testsuites/ada/sptests/Makefile.am                                 | 1 -
 testsuites/ada/sptests/sp01/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp02/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp03/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp04/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp05/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp06/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp07/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp08/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp09/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp11/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp12/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp13/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp14/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp15/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp16/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp17/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp19/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp20/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp22/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp23/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp24/Makefile.am                            | 1 -
 testsuites/ada/sptests/sp25/Makefile.am                            | 1 -
 testsuites/ada/sptests/spatcb01/Makefile.am                        | 1 -
 testsuites/ada/sptests/spname01/Makefile.am                        | 1 -
 testsuites/ada/support/Makefile.am                                 | 1 -
 testsuites/ada/tmtests/Makefile.am                                 | 1 -
 testsuites/ada/tmtests/tm01/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm02/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm03/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm04/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm05/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm06/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm07/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm08/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm09/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm10/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm11/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm12/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm13/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm14/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm15/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm16/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm17/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm18/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm19/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm20/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm21/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm22/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm23/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm24/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm25/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm28/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tm29/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tmck/Makefile.am                            | 1 -
 testsuites/ada/tmtests/tmoverhd/Makefile.am                        | 1 -
 testsuites/automake/local.am                                       | 5 -----
 testsuites/benchmarks/Makefile.am                                  | 1 -
 testsuites/fstests/Makefile.am                                     | 1 -
 testsuites/libtests/Makefile.am                                    | 1 -
 testsuites/mptests/Makefile.am                                     | 1 -
 testsuites/mptests/mp01/Makefile.am                                | 1 -
 testsuites/mptests/mp03/Makefile.am                                | 1 -
 testsuites/mptests/mp04/Makefile.am                                | 1 -
 testsuites/mptests/mp05/Makefile.am                                | 1 -
 testsuites/mptests/mp06/Makefile.am                                | 1 -
 testsuites/mptests/mp07/Makefile.am                                | 1 -
 testsuites/mptests/mp08/Makefile.am                                | 1 -
 testsuites/mptests/mp09/Makefile.am                                | 1 -
 testsuites/mptests/mp10/Makefile.am                                | 1 -
 testsuites/mptests/mp11/Makefile.am                                | 1 -
 testsuites/mptests/mp12/Makefile.am                                | 1 -
 testsuites/mptests/mp13/Makefile.am                                | 1 -
 testsuites/mptests/mp14/Makefile.am                                | 1 -
 testsuites/psxtests/Makefile.am                                    | 1 -
 testsuites/psxtmtests/Makefile.am                                  | 1 -
 testsuites/rhealstone/Makefile.am                                  | 1 -
 testsuites/samples/Makefile.am                                     | 1 -
 testsuites/smptests/Makefile.am                                    | 1 -
 testsuites/sptests/Makefile.am                                     | 1 -
 testsuites/tmtests/Makefile.am                                     | 1 -
 244 files changed, 253 deletions(-)

diff --git a/automake/local.am b/automake/local.am
deleted file mode 100644
index 8068b4c..0000000
--- a/automake/local.am
+++ /dev/null
@@ -1,3 +0,0 @@
-PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
-
-all-local: $(TMPINSTALL_FILES)
diff --git a/c/src/Makefile.am b/c/src/Makefile.am
index 1faca04..3c31f66 100644
--- a/c/src/Makefile.am
+++ b/c/src/Makefile.am
@@ -36,5 +36,4 @@ pkgconfig_DATA = @host_alias at -@RTEMS_BSP at .pc
 include $(DEPDIR)/cfg.P
 
 include $(top_srcdir)/automake/subdirs.am
-include $(top_srcdir)/automake/local.am
 include $(srcdir)/../../bsps/headers.am
diff --git a/c/src/automake/local.am b/c/src/automake/local.am
deleted file mode 100644
index 8068b4c..0000000
--- a/c/src/automake/local.am
+++ /dev/null
@@ -1,3 +0,0 @@
-PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
-
-all-local: $(TMPINSTALL_FILES)
diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am
index becdacb..372391e 100644
--- a/c/src/lib/libbsp/Makefile.am
+++ b/c/src/lib/libbsp/Makefile.am
@@ -8,5 +8,4 @@ DIST_SUBDIRS = @libbsp_cpu_subdir@
 
 
 
-include $(top_srcdir)/automake/local.am
 include $(top_srcdir)/automake/subdirs.am
diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am
index af842ee..b558fb8 100644
--- a/c/src/lib/libbsp/arm/Makefile.am
+++ b/c/src/lib/libbsp/arm/Makefile.am
@@ -13,5 +13,4 @@ dist_project_lib_DATA += ../../../../../bsps/arm/shared/start/linkcmds.armv7m
 # comm
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/arm/headers.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 5f34001..36c7957 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -89,7 +89,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-l2c-310.c
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/altera-cyclone-v/headers.am
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index a0b2d92..6a90f6b 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -160,7 +160,6 @@ librtemsbsp_a_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/bsps/arm/atsam/include/libchip/
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/atsam/headers.am
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index 2d9ed06..a990d73 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -90,7 +90,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/beagle/headers.am
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 0cd6f11..aacb07e 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -45,7 +45,6 @@ endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/csb336/headers.am
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 554afaa..b7f1165 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -73,7 +73,6 @@ endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/csb337/headers.am
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index d54ceb2..41085b7 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -48,7 +48,6 @@ if HAS_NETWORKING
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/net/network.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/edb7312/headers.am
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index 933ba1b..0ae0e82 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -52,7 +52,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm-cp15-set-exc
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/gdbarmsim/headers.am
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 9e2e5fd..0ae19fb 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -51,7 +51,6 @@ endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/gumstix/headers.am
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index 8bc8353..485a880 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -78,7 +78,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspstarthooks.c
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/imx/headers.am
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index 206db18..2ec5854 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -76,7 +76,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/i2c/ssi.c
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/lm3s69xx/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index b443893..7f4c8a5 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -112,7 +112,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/start/bspstarthooks.
 # ----------------------------
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/lpc176x/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index 642e75b..0a921f6 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -129,7 +129,6 @@ endif
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/lpc24xx/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index c6e7d39..5306554 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -107,7 +107,6 @@ endif
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/lpc32xx/headers.am
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 8aa4e43..5860868 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -115,7 +115,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/mm_config_
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/raspberrypi/headers.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 01e1f3e..4512d75 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -84,7 +84,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/realview-pbx-a9/start/fb-con
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/realview-pbx-a9/headers.am
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index 286b5a7..0606032 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -45,7 +45,6 @@ if HAS_NETWORKING
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/rtl22xx/net/network.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/rtl22xx/headers.am
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index ba38b1a..b2602da 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -46,7 +46,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/smdk2410/headers.am
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index 02e9dd4..53ea1db 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -77,7 +77,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/stm32f4/headers.am
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 2e017f3..bbff1ec 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -110,7 +110,6 @@ endif
 # ----------------------------
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/tms570/headers.am
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index ac04c21..0ec2944 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -81,7 +81,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/start/bspstartmm
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/arm/xilinx-zynq/headers.am
diff --git a/c/src/lib/libbsp/bfin/Makefile.am b/c/src/lib/libbsp/bfin/Makefile.am
index 24e3862..d364204 100644
--- a/c/src/lib/libbsp/bfin/Makefile.am
+++ b/c/src/lib/libbsp/bfin/Makefile.am
@@ -4,5 +4,4 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/bfin/headers.am
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index d92a6bc..2e45747 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
@@ -30,7 +30,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/TLL6527M/start/interrupt.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/bfin/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/bfin/TLL6527M/headers.am
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index f34adc1..6bd99a9 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -35,7 +35,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/bf537Stamp/net/networkconfi
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/bf537Stamp/net/ethernet.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/bfin/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/bfin/bf537Stamp/headers.am
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index ef43e92..e15b51c 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -31,7 +31,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/shared/interrupt.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/bfin/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/bfin/eZKit533/headers.am
diff --git a/c/src/lib/libbsp/epiphany/Makefile.am b/c/src/lib/libbsp/epiphany/Makefile.am
index f0db9ba..c024c4d 100644
--- a/c/src/lib/libbsp/epiphany/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/Makefile.am
@@ -4,5 +4,4 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## added but it is present in the source tree.
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/epiphany/headers.am
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index b51e76e..f4901fd 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -61,7 +61,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/epiphany/epiphany_sim/console/console-io.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/epiphany/epiphany_sim/headers.am
diff --git a/c/src/lib/libbsp/i386/Makefile.am b/c/src/lib/libbsp/i386/Makefile.am
index 9cd3922..093975a 100644
--- a/c/src/lib/libbsp/i386/Makefile.am
+++ b/c/src/lib/libbsp/i386/Makefile.am
@@ -12,5 +12,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 # shared/pci
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/i386/headers.am
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index cec8fd6..354ad0b 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -143,7 +143,6 @@ librtemsbsp_a_LIBADD = appstart.$(OBJEXT)
 endif
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(top_srcdir)/../../../../automake/subdirs.am
diff --git a/c/src/lib/libbsp/lm32/Makefile.am b/c/src/lib/libbsp/lm32/Makefile.am
index ae304be..887b925 100644
--- a/c/src/lib/libbsp/lm32/Makefile.am
+++ b/c/src/lib/libbsp/lm32/Makefile.am
@@ -4,5 +4,4 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/lm32/headers.am
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index 83a7ad8..7e2995c 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -43,6 +43,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/net/tsmac.c
 endif
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/lm32/lm32_evr/headers.am
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index 3c3b16e..cddce2f 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -89,6 +89,5 @@ if HAS_NETWORKING
 librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/net/network.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/lm32/milkymist/headers.am
diff --git a/c/src/lib/libbsp/m32c/Makefile.am b/c/src/lib/libbsp/m32c/Makefile.am
index 8e7c7de..d2a5a9e 100644
--- a/c/src/lib/libbsp/m32c/Makefile.am
+++ b/c/src/lib/libbsp/m32c/Makefile.am
@@ -5,4 +5,3 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index 1ab878b..c7f636b 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -32,6 +32,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/btimer/btimer.c
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m32c/m32cbsp/headers.am
diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am
index 669fe9b..1636535 100644
--- a/c/src/lib/libbsp/m68k/Makefile.am
+++ b/c/src/lib/libbsp/m68k/Makefile.am
@@ -9,5 +9,4 @@ dist_project_lib_DATA = ../../../../../bsps/m68k/shared/start/linkcmds.base
 
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/m68k/headers.am
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index 456dd8a..818d71e 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -41,6 +41,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf5282.
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/av5282/headers.am
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index b731659..11d9bc2 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -37,6 +37,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/dev/timer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/dev/timerisr.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/start/idle-mcf5272.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/csb360/headers.am
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index 632cbca..ee39ecd 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -40,6 +40,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/gen68340/headers.am
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index d3cbc78..2e8055b 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -49,6 +49,5 @@ if HAS_FPSP
 include $(srcdir)/../../../../../../bsps/m68k/shared/fpsp-sources.am
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/gen68360/headers.am
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 2a8229b..8baa245 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -59,6 +59,5 @@ if HAS_NETWORKING
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/net/network.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/genmcf548x/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 8c31be6..5264985 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -48,6 +48,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/dev/mcfuart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/dev/timer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/dev/timerisr.S
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mcf5206elite/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index dee7622..fdc1820 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -41,6 +41,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf5223x
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mcf52235/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index 792af31..c6dae92 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -32,6 +32,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf5225x
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mcf5225x/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index c036171..793e89f 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -45,6 +45,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf5235.
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mcf5235/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index f269f93..54907f7 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -43,6 +43,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf532x.
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mcf5329/headers.am
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 328f60a..8123be5 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -40,6 +40,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mrm332/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 527cd53..86c7c45 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -41,6 +41,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mvme147/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index 7f74035..2a604c1 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -50,6 +50,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mvme147s/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index de63e7a..bf753b5 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -51,6 +51,5 @@ include $(srcdir)/../../../../../../bsps/m68k/shared/fpsp-sources.am
 endif
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mvme162/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index 01899a9..a72ca85 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -43,7 +43,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/shared/fpsp-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/mvme167/headers.am
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 5949cb8..28cd33f 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -41,6 +41,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache-mcf5282.
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/m68k/uC5282/headers.am
diff --git a/c/src/lib/libbsp/mips/Makefile.am b/c/src/lib/libbsp/mips/Makefile.am
index 6d42748..3dd369d 100644
--- a/c/src/lib/libbsp/mips/Makefile.am
+++ b/c/src/lib/libbsp/mips/Makefile.am
@@ -4,5 +4,4 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/mips/headers.am
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index a42d884..56622fe 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -46,7 +46,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/mips/csb350/headers.am
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index 94b0cc6..248bb7d 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -49,7 +49,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/mips/hurricane/headers.am
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 548bc03..a91c284 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -40,7 +40,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/mips/jmr3904/headers.am
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index 68567e3..b048d13 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -61,7 +61,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/irq/vectorisrs.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/irq/interruptmask.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/i8259.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/mips/malta/headers.am
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index 875f1be..590ba37 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -49,7 +49,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/mips/rbtx4925/headers.am
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index 32e8842..4db7da5 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -49,7 +49,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/mips/rbtx4938/headers.am
diff --git a/c/src/lib/libbsp/moxie/Makefile.am b/c/src/lib/libbsp/moxie/Makefile.am
index 3caad19..afc822e 100644
--- a/c/src/lib/libbsp/moxie/Makefile.am
+++ b/c/src/lib/libbsp/moxie/Makefile.am
@@ -8,4 +8,3 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index d0ef5dd..f689cf5 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -40,6 +40,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/moxie/moxiesim/headers.am
diff --git a/c/src/lib/libbsp/nios2/Makefile.am b/c/src/lib/libbsp/nios2/Makefile.am
index c25b2d3..46a80a8 100644
--- a/c/src/lib/libbsp/nios2/Makefile.am
+++ b/c/src/lib/libbsp/nios2/Makefile.am
@@ -4,4 +4,3 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index 2db4389..7aab278 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -39,6 +39,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/nios2/nios2_iss/btimer/btimer.c
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/nios2/nios2_iss/headers.am
diff --git a/c/src/lib/libbsp/no_cpu/Makefile.am b/c/src/lib/libbsp/no_cpu/Makefile.am
index c25b2d3..46a80a8 100644
--- a/c/src/lib/libbsp/no_cpu/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/Makefile.am
@@ -4,4 +4,3 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.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 a9d6906..e42f03c 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -34,6 +34,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/mpci/lock.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/mpci/mpisr.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/no_cpu/no_bsp/headers.am
diff --git a/c/src/lib/libbsp/or1k/Makefile.am b/c/src/lib/libbsp/or1k/Makefile.am
index 8f3cbcb..e00a907 100644
--- a/c/src/lib/libbsp/or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/Makefile.am
@@ -6,5 +6,4 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/or1k/headers.am
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index d9e14c5..bc3ede7 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -72,7 +72,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/shared/cache/cache.c
 ###############################################################################
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/or1k/generic_or1k/headers.am
diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am
index d7710d7..c70691e 100644
--- a/c/src/lib/libbsp/powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/Makefile.am
@@ -38,5 +38,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 ## shared/vme
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/powerpc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index d8a2d00..f48cfcf 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -109,7 +109,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index bdf4d22..a71b99a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -113,7 +113,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index f661043..ba6f379 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -75,7 +75,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 43c31ec..89594c8 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -46,7 +46,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc40
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/btimer/btimer-ppc-dec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 3d075b8..c79d81e 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -94,7 +94,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
index f522135..42b7054 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -65,4 +65,3 @@ TMPINSTALL_FILES += $(PROJECT_LIB)/ppcboot.lds
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am
index 591cb89..34bed1c 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am
@@ -24,4 +24,3 @@ qemu_fakerom.elf: qemu_fakerom.$(OBJEXT) qemu_fakeres.$(OBJEXT)
 qemu_fakerom.bin: qemu_fakerom.$(OBJEXT) qemu_fakeres.$(OBJEXT)
 	$(LD) -o $@ $^ --oformat binary -nostdlib -Ttext 0xfff00000 --section-start=.romentry=0xfffffffc
 
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 2f52f84..15b9962 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -105,7 +105,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/flash_s
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/irq.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/siu.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index cac9650..ac7fa0a 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -55,7 +55,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/dpram.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/mmu.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 2c21714..85c6a53 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -91,7 +91,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legac
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 5d8d807..0c62981 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -84,7 +84,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 2e7420d..f109f17 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -68,7 +68,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 5a2918f..6886785 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -45,7 +45,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 3ef8931..f5fd701 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -93,7 +93,6 @@ if HAS_SMP
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/bspsmp.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 86dc3c5..51ea721 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -44,7 +44,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/raw_exceptio
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/vectors_init.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/vectors.S
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/ss555/headers.am
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 944c54c..b72c53c 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -56,7 +56,6 @@ if HAS_SMP
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspsmp-dummy.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 1be4387..4e141f3 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -60,7 +60,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/cp.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/dpram.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/mmu.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index c0820c7..ad5645a 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -58,7 +58,6 @@ endif
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/btimer/btimer-ppc-dec.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index e8c4222..62ca072 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -45,7 +45,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc40
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/btimer/btimer-ppc-dec.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 59eeb66..2dd664d 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -47,7 +47,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/clock/clock-ppc-d
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/btimer/btimer-ppc-dec.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am
diff --git a/c/src/lib/libbsp/riscv/Makefile.am b/c/src/lib/libbsp/riscv/Makefile.am
index 3683101..3238acf 100644
--- a/c/src/lib/libbsp/riscv/Makefile.am
+++ b/c/src/lib/libbsp/riscv/Makefile.am
@@ -7,5 +7,4 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/riscv/headers.am
diff --git a/c/src/lib/libbsp/riscv/riscv/Makefile.am b/c/src/lib/libbsp/riscv/riscv/Makefile.am
index ad8410f..b8a034c 100644
--- a/c/src/lib/libbsp/riscv/riscv/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv/Makefile.am
@@ -64,7 +64,6 @@ if HAS_SMP
 librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/start/bspsmp.c
 endif
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/riscv/riscv/headers.am
diff --git a/c/src/lib/libbsp/sh/Makefile.am b/c/src/lib/libbsp/sh/Makefile.am
index 046d862..92d3859 100644
--- a/c/src/lib/libbsp/sh/Makefile.am
+++ b/c/src/lib/libbsp/sh/Makefile.am
@@ -5,4 +5,3 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index ca2c0f9..3fe5318 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -41,6 +41,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sh/gensh1/headers.am
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index 96c30a9..027f159 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -44,6 +44,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sh/gensh2/headers.am
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index 705ac52..26bb8b5 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -40,6 +40,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/start/hw_init.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sh/gensh4/headers.am
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index f9aab72..947ff53 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -43,6 +43,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sh/shsim/headers.am
diff --git a/c/src/lib/libbsp/sparc/Makefile.am b/c/src/lib/libbsp/sparc/Makefile.am
index 9521dd5..5b3a002 100644
--- a/c/src/lib/libbsp/sparc/Makefile.am
+++ b/c/src/lib/libbsp/sparc/Makefile.am
@@ -61,5 +61,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 # L4STAT
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/sparc/headers.am
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 3237022..994e55c 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -66,7 +66,6 @@ endif
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sparc/erc32/headers.am
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index aaaa484..7471007 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -169,7 +169,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/net/network_interfa
 endif
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sparc/leon2/headers.am
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 4cd2652..9fff259 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -197,7 +197,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/mpci/mpisr.c
 endif
 
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sparc/leon3/headers.am
diff --git a/c/src/lib/libbsp/sparc64/Makefile.am b/c/src/lib/libbsp/sparc64/Makefile.am
index b0e0689..7ffdba4 100644
--- a/c/src/lib/libbsp/sparc64/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/Makefile.am
@@ -4,5 +4,4 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
 include $(srcdir)/../../../../../bsps/sparc64/headers.am
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index bdf737f..ec5763e 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -45,6 +45,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sparc64/niagara/headers.am
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 234f335..1fbb6d6 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -56,6 +56,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sparc64/usiii/headers.am
diff --git a/c/src/lib/libbsp/v850/Makefile.am b/c/src/lib/libbsp/v850/Makefile.am
index d0e28ae..c10765b 100644
--- a/c/src/lib/libbsp/v850/Makefile.am
+++ b/c/src/lib/libbsp/v850/Makefile.am
@@ -10,4 +10,3 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index 8674a49..b502e32 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -36,6 +36,5 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 project_lib_LIBRARIES = librtemsbsp.a
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/v850/gdbv850sim/headers.am
diff --git a/c/src/lib/libbsp/x86_64/Makefile.am b/c/src/lib/libbsp/x86_64/Makefile.am
index c25b2d3..46a80a8 100644
--- a/c/src/lib/libbsp/x86_64/Makefile.am
+++ b/c/src/lib/libbsp/x86_64/Makefile.am
@@ -4,4 +4,3 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/x86_64/amd64/Makefile.am b/c/src/lib/libbsp/x86_64/amd64/Makefile.am
index 101c98b..eb08838 100644
--- a/c/src/lib/libbsp/x86_64/amd64/Makefile.am
+++ b/c/src/lib/libbsp/x86_64/amd64/Makefile.am
@@ -43,7 +43,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 # cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/x86_64/amd64/headers.am
diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am
index 7bf70ca..44350e9 100644
--- a/c/src/make/Makefile.am
+++ b/c/src/make/Makefile.am
@@ -86,4 +86,3 @@ CLEANFILES += Makefile.inc
 rtems_make_compilersdir = $(rtems_makedir)/compilers
 dist_rtems_make_compilers_DATA = compilers/gcc-target-default.cfg
 
-include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 56ddbf0..cf0888a 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -1931,5 +1931,4 @@ endif
 endif
 
 include $(top_srcdir)/automake/subdirs.am
-include $(top_srcdir)/automake/local.am
 include $(srcdir)/headers.am
diff --git a/cpukit/automake/local.am b/cpukit/automake/local.am
deleted file mode 100644
index 3815a7d..0000000
--- a/cpukit/automake/local.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-all-local: $(TMPINSTALL_FILES)
diff --git a/cpukit/score/cpu/Makefile.am b/cpukit/score/cpu/Makefile.am
index 4ddbdf0..03cd431 100644
--- a/cpukit/score/cpu/Makefile.am
+++ b/cpukit/score/cpu/Makefile.am
@@ -21,4 +21,3 @@ DIST_SUBDIRS += sparc64
 DIST_SUBDIRS += v850
 
 include $(top_srcdir)/automake/subdirs.am
-include $(top_srcdir)/automake/local.am
diff --git a/testsuites/Makefile.am b/testsuites/Makefile.am
index 1d486cf..43a0ae1 100644
--- a/testsuites/Makefile.am
+++ b/testsuites/Makefile.am
@@ -14,4 +14,3 @@ _SUBDIRS = @subdirs@
 
 
 include $(top_srcdir)/automake/subdirs.am
-include $(top_srcdir)/automake/local.am
diff --git a/testsuites/ada/Makefile.am b/testsuites/ada/Makefile.am
index a3dd8aa..31d70b2 100644
--- a/testsuites/ada/Makefile.am
+++ b/testsuites/ada/Makefile.am
@@ -9,4 +9,3 @@ DIST_SUBDIRS = support samples sptests tmtests mptests
 
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/Makefile.am b/testsuites/ada/mptests/Makefile.am
index 733c9ed..bdcb768 100644
--- a/testsuites/ada/mptests/Makefile.am
+++ b/testsuites/ada/mptests/Makefile.am
@@ -14,4 +14,3 @@ _SUBDIRS += mp13
 _SUBDIRS += mp14
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp01/Makefile.am b/testsuites/ada/mptests/mp01/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp01/Makefile.am
+++ b/testsuites/ada/mptests/mp01/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp01/node1/Makefile.am b/testsuites/ada/mptests/mp01/node1/Makefile.am
index 154504a..7d78a6f 100644
--- a/testsuites/ada/mptests/mp01/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node1/Makefile.am
@@ -16,4 +16,3 @@ mp01_ada_mp01_node1$(EXEEXT): mp01_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp01-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp01/node2/Makefile.am b/testsuites/ada/mptests/mp01/node2/Makefile.am
index a58a210..907766e 100644
--- a/testsuites/ada/mptests/mp01/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node2/Makefile.am
@@ -16,4 +16,3 @@ mp01_ada_mp01_node2$(EXEEXT): mp01_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp01-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp03/Makefile.am b/testsuites/ada/mptests/mp03/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp03/Makefile.am
+++ b/testsuites/ada/mptests/mp03/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp03/node1/Makefile.am b/testsuites/ada/mptests/mp03/node1/Makefile.am
index 5c9b6f6..679d7a9 100644
--- a/testsuites/ada/mptests/mp03/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node1/Makefile.am
@@ -16,4 +16,3 @@ mp03_ada_mp03_node1$(EXEEXT): mp03_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp03-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp03/node2/Makefile.am b/testsuites/ada/mptests/mp03/node2/Makefile.am
index bf8b544..80db1c1 100644
--- a/testsuites/ada/mptests/mp03/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node2/Makefile.am
@@ -16,4 +16,3 @@ mp03_ada_mp03_node2$(EXEEXT): mp03_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp03-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp04/Makefile.am b/testsuites/ada/mptests/mp04/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp04/Makefile.am
+++ b/testsuites/ada/mptests/mp04/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp04/node1/Makefile.am b/testsuites/ada/mptests/mp04/node1/Makefile.am
index 633209a..496ff62 100644
--- a/testsuites/ada/mptests/mp04/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node1/Makefile.am
@@ -16,4 +16,3 @@ mp04_ada_mp04_node1$(EXEEXT): mp04_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp04-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp04/node2/Makefile.am b/testsuites/ada/mptests/mp04/node2/Makefile.am
index cce97cd..a2192b1 100644
--- a/testsuites/ada/mptests/mp04/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node2/Makefile.am
@@ -16,4 +16,3 @@ mp04_ada_mp04_node2$(EXEEXT): mp04_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp04-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp05/Makefile.am b/testsuites/ada/mptests/mp05/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp05/Makefile.am
+++ b/testsuites/ada/mptests/mp05/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp05/node1/Makefile.am b/testsuites/ada/mptests/mp05/node1/Makefile.am
index 669235e..edae16e 100644
--- a/testsuites/ada/mptests/mp05/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node1/Makefile.am
@@ -16,4 +16,3 @@ mp05_ada_mp05_node1$(EXEEXT): mp05_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp05-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp05/node2/Makefile.am b/testsuites/ada/mptests/mp05/node2/Makefile.am
index 15de8d5..06aa7e9 100644
--- a/testsuites/ada/mptests/mp05/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node2/Makefile.am
@@ -16,4 +16,3 @@ mp05_ada_mp05_node2$(EXEEXT): mp05_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp05-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp06/Makefile.am b/testsuites/ada/mptests/mp06/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp06/Makefile.am
+++ b/testsuites/ada/mptests/mp06/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp06/node1/Makefile.am b/testsuites/ada/mptests/mp06/node1/Makefile.am
index 45bde9a..201d17c 100644
--- a/testsuites/ada/mptests/mp06/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node1/Makefile.am
@@ -16,4 +16,3 @@ mp06_ada_mp06_node1$(EXEEXT): mp06_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp06-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp06/node2/Makefile.am b/testsuites/ada/mptests/mp06/node2/Makefile.am
index e16512e..3df636d 100644
--- a/testsuites/ada/mptests/mp06/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node2/Makefile.am
@@ -16,4 +16,3 @@ mp06_ada_mp06_node2$(EXEEXT): mp06_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp06-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp07/Makefile.am b/testsuites/ada/mptests/mp07/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp07/Makefile.am
+++ b/testsuites/ada/mptests/mp07/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp07/node1/Makefile.am b/testsuites/ada/mptests/mp07/node1/Makefile.am
index c6b77cd..d39a38d 100644
--- a/testsuites/ada/mptests/mp07/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node1/Makefile.am
@@ -16,4 +16,3 @@ mp07_ada_mp07_node1$(EXEEXT): mp07_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp07-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp07/node2/Makefile.am b/testsuites/ada/mptests/mp07/node2/Makefile.am
index 95e3108..acf5e4a 100644
--- a/testsuites/ada/mptests/mp07/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node2/Makefile.am
@@ -16,4 +16,3 @@ mp07_ada_mp07_node2$(EXEEXT): mp07_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp07-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp08/Makefile.am b/testsuites/ada/mptests/mp08/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp08/Makefile.am
+++ b/testsuites/ada/mptests/mp08/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp08/node1/Makefile.am b/testsuites/ada/mptests/mp08/node1/Makefile.am
index be1b6ce..2885adb 100644
--- a/testsuites/ada/mptests/mp08/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node1/Makefile.am
@@ -16,4 +16,3 @@ mp08_ada_mp08_node1$(EXEEXT): mp08_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp08-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp08/node2/Makefile.am b/testsuites/ada/mptests/mp08/node2/Makefile.am
index 1a3271d..4f174ac 100644
--- a/testsuites/ada/mptests/mp08/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node2/Makefile.am
@@ -16,4 +16,3 @@ mp08_ada_mp08_node2$(EXEEXT): mp08_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp08-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp09/Makefile.am b/testsuites/ada/mptests/mp09/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp09/Makefile.am
+++ b/testsuites/ada/mptests/mp09/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp09/node1/Makefile.am b/testsuites/ada/mptests/mp09/node1/Makefile.am
index 54e4418..6847835 100644
--- a/testsuites/ada/mptests/mp09/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node1/Makefile.am
@@ -16,4 +16,3 @@ mp09_ada_mp09_node1$(EXEEXT): mp09_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp09-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp09/node2/Makefile.am b/testsuites/ada/mptests/mp09/node2/Makefile.am
index e2ec626..61fd3f3 100644
--- a/testsuites/ada/mptests/mp09/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node2/Makefile.am
@@ -16,4 +16,3 @@ mp09_ada_mp09_node2$(EXEEXT): mp09_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp09-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp10/Makefile.am b/testsuites/ada/mptests/mp10/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp10/Makefile.am
+++ b/testsuites/ada/mptests/mp10/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp10/node1/Makefile.am b/testsuites/ada/mptests/mp10/node1/Makefile.am
index f682f32..029c77e 100644
--- a/testsuites/ada/mptests/mp10/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node1/Makefile.am
@@ -16,4 +16,3 @@ mp10_ada_mp10_node1$(EXEEXT): mp10_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp10-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp10/node2/Makefile.am b/testsuites/ada/mptests/mp10/node2/Makefile.am
index cc6335b..70d1740 100644
--- a/testsuites/ada/mptests/mp10/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node2/Makefile.am
@@ -16,4 +16,3 @@ mp10_ada_mp10_node2$(EXEEXT): mp10_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp10-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp11/Makefile.am b/testsuites/ada/mptests/mp11/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp11/Makefile.am
+++ b/testsuites/ada/mptests/mp11/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp11/node1/Makefile.am b/testsuites/ada/mptests/mp11/node1/Makefile.am
index 0511699..ae6570e 100644
--- a/testsuites/ada/mptests/mp11/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node1/Makefile.am
@@ -16,4 +16,3 @@ mp11_ada_mp11_node1$(EXEEXT): mp11_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp11-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp11/node2/Makefile.am b/testsuites/ada/mptests/mp11/node2/Makefile.am
index 7055fcc..ae4cc32 100644
--- a/testsuites/ada/mptests/mp11/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node2/Makefile.am
@@ -16,4 +16,3 @@ mp11_ada_mp11_node2$(EXEEXT): mp11_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp11-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp12/Makefile.am b/testsuites/ada/mptests/mp12/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp12/Makefile.am
+++ b/testsuites/ada/mptests/mp12/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp12/node1/Makefile.am b/testsuites/ada/mptests/mp12/node1/Makefile.am
index 9daa6a0..a95c153 100644
--- a/testsuites/ada/mptests/mp12/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node1/Makefile.am
@@ -16,4 +16,3 @@ mp12_ada_mp12_node1$(EXEEXT): mp12_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp12-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp12/node2/Makefile.am b/testsuites/ada/mptests/mp12/node2/Makefile.am
index b3e8df3..eb35a18 100644
--- a/testsuites/ada/mptests/mp12/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node2/Makefile.am
@@ -16,4 +16,3 @@ mp12_ada_mp12_node2$(EXEEXT): mp12_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp12-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp13/Makefile.am b/testsuites/ada/mptests/mp13/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp13/Makefile.am
+++ b/testsuites/ada/mptests/mp13/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp13/node1/Makefile.am b/testsuites/ada/mptests/mp13/node1/Makefile.am
index bf641ce..4020129 100644
--- a/testsuites/ada/mptests/mp13/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node1/Makefile.am
@@ -16,4 +16,3 @@ mp13_ada_mp13_node1$(EXEEXT): mp13_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp13-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp13/node2/Makefile.am b/testsuites/ada/mptests/mp13/node2/Makefile.am
index 95e9798..89ebc23 100644
--- a/testsuites/ada/mptests/mp13/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node2/Makefile.am
@@ -16,4 +16,3 @@ mp13_ada_mp13_node2$(EXEEXT): mp13_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp13-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp14/Makefile.am b/testsuites/ada/mptests/mp14/Makefile.am
index d1dad53..acd9569 100644
--- a/testsuites/ada/mptests/mp14/Makefile.am
+++ b/testsuites/ada/mptests/mp14/Makefile.am
@@ -1,4 +1,3 @@
 _SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp14/node1/Makefile.am b/testsuites/ada/mptests/mp14/node1/Makefile.am
index 6e2a212..373b8b2 100644
--- a/testsuites/ada/mptests/mp14/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node1/Makefile.am
@@ -16,4 +16,3 @@ mp14_ada_mp14_node1$(EXEEXT): mp14_node1.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp14-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/mptests/mp14/node2/Makefile.am b/testsuites/ada/mptests/mp14/node2/Makefile.am
index b694774..ceda2b7 100644
--- a/testsuites/ada/mptests/mp14/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node2/Makefile.am
@@ -16,4 +16,3 @@ mp14_ada_mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_mp14-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/samples/Makefile.am b/testsuites/ada/samples/Makefile.am
index 0aa25af..e50f2c8 100644
--- a/testsuites/ada/samples/Makefile.am
+++ b/testsuites/ada/samples/Makefile.am
@@ -6,4 +6,3 @@ endif
 DIST_SUBDIRS = hello ticker base_sp base_mp nsecs
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/samples/base_mp/Makefile.am b/testsuites/ada/samples/base_mp/Makefile.am
index c9dd8e8..d1402f0 100644
--- a/testsuites/ada/samples/base_mp/Makefile.am
+++ b/testsuites/ada/samples/base_mp/Makefile.am
@@ -16,4 +16,3 @@ _SUBDIRS = node1 node2
 
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/samples/base_mp/node1/Makefile.am b/testsuites/ada/samples/base_mp/node1/Makefile.am
index f9e45cf..4916854 100644
--- a/testsuites/ada/samples/base_mp/node1/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node1/Makefile.am
@@ -19,4 +19,3 @@ init.o: ../../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node1.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/samples/base_mp/node2/Makefile.am b/testsuites/ada/samples/base_mp/node2/Makefile.am
index 6567b95..277a394 100644
--- a/testsuites/ada/samples/base_mp/node2/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node2/Makefile.am
@@ -19,4 +19,3 @@ init.o: ../../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node2.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/samples/base_sp/Makefile.am b/testsuites/ada/samples/base_sp/Makefile.am
index 97ed434..10b0709 100644
--- a/testsuites/ada/samples/base_sp/Makefile.am
+++ b/testsuites/ada/samples/base_sp/Makefile.am
@@ -16,4 +16,3 @@ ada_base_sp_SOURCES = base_sp.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_sp.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/samples/hello/Makefile.am b/testsuites/ada/samples/hello/Makefile.am
index ccf8ccf..9efde90 100644
--- a/testsuites/ada/samples/hello/Makefile.am
+++ b/testsuites/ada/samples/hello/Makefile.am
@@ -16,4 +16,3 @@ ada_hello_SOURCES = hello.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_hello.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/samples/nsecs/Makefile.am b/testsuites/ada/samples/nsecs/Makefile.am
index e0b0849..21e27b4 100644
--- a/testsuites/ada/samples/nsecs/Makefile.am
+++ b/testsuites/ada/samples/nsecs/Makefile.am
@@ -16,4 +16,3 @@ ada_nsecs_SOURCES = nsecs.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_nsecs.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/samples/ticker/Makefile.am b/testsuites/ada/samples/ticker/Makefile.am
index de5050e..c000abd 100644
--- a/testsuites/ada/samples/ticker/Makefile.am
+++ b/testsuites/ada/samples/ticker/Makefile.am
@@ -16,4 +16,3 @@ ada_ticker_SOURCES = ticker.adb config.h sptest.adb sptest.ads
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_ticker.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/Makefile.am b/testsuites/ada/sptests/Makefile.am
index fda256f..b79ea21 100644
--- a/testsuites/ada/sptests/Makefile.am
+++ b/testsuites/ada/sptests/Makefile.am
@@ -25,4 +25,3 @@ _SUBDIRS += spname01
 _SUBDIRS += spatcb01
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp01/Makefile.am b/testsuites/ada/sptests/sp01/Makefile.am
index 0fc6a6d..62b1e6f 100644
--- a/testsuites/ada/sptests/sp01/Makefile.am
+++ b/testsuites/ada/sptests/sp01/Makefile.am
@@ -13,4 +13,3 @@ ada_sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp01.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp02/Makefile.am b/testsuites/ada/sptests/sp02/Makefile.am
index 7e68120..2c82e1e 100644
--- a/testsuites/ada/sptests/sp02/Makefile.am
+++ b/testsuites/ada/sptests/sp02/Makefile.am
@@ -13,4 +13,3 @@ ada_sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp02.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp03/Makefile.am b/testsuites/ada/sptests/sp03/Makefile.am
index 9a7ccfa..6e6a502 100644
--- a/testsuites/ada/sptests/sp03/Makefile.am
+++ b/testsuites/ada/sptests/sp03/Makefile.am
@@ -13,4 +13,3 @@ ada_sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp03.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp04/Makefile.am b/testsuites/ada/sptests/sp04/Makefile.am
index fc5d2be..a9e6f4c 100644
--- a/testsuites/ada/sptests/sp04/Makefile.am
+++ b/testsuites/ada/sptests/sp04/Makefile.am
@@ -13,4 +13,3 @@ ada_sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp04.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp05/Makefile.am b/testsuites/ada/sptests/sp05/Makefile.am
index d206e1b..8ace676 100644
--- a/testsuites/ada/sptests/sp05/Makefile.am
+++ b/testsuites/ada/sptests/sp05/Makefile.am
@@ -13,4 +13,3 @@ ada_sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp05.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp06/Makefile.am b/testsuites/ada/sptests/sp06/Makefile.am
index 145423b..0cc703a 100644
--- a/testsuites/ada/sptests/sp06/Makefile.am
+++ b/testsuites/ada/sptests/sp06/Makefile.am
@@ -13,4 +13,3 @@ ada_sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp06.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp07/Makefile.am b/testsuites/ada/sptests/sp07/Makefile.am
index 076b97d..8ce5e22 100644
--- a/testsuites/ada/sptests/sp07/Makefile.am
+++ b/testsuites/ada/sptests/sp07/Makefile.am
@@ -14,4 +14,3 @@ ada_sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp07.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp08/Makefile.am b/testsuites/ada/sptests/sp08/Makefile.am
index 5c6fc3e..5c9d5d8 100644
--- a/testsuites/ada/sptests/sp08/Makefile.am
+++ b/testsuites/ada/sptests/sp08/Makefile.am
@@ -13,4 +13,3 @@ ada_sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp08.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp09/Makefile.am b/testsuites/ada/sptests/sp09/Makefile.am
index 8956a38..c625d70 100644
--- a/testsuites/ada/sptests/sp09/Makefile.am
+++ b/testsuites/ada/sptests/sp09/Makefile.am
@@ -18,4 +18,3 @@ ada_sp09$(EXEEXT): sp09.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp09.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp11/Makefile.am b/testsuites/ada/sptests/sp11/Makefile.am
index ec4ded6..e900713 100644
--- a/testsuites/ada/sptests/sp11/Makefile.am
+++ b/testsuites/ada/sptests/sp11/Makefile.am
@@ -13,4 +13,3 @@ ada_sp11$(EXEEXT): sp11.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp11.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp12/Makefile.am b/testsuites/ada/sptests/sp12/Makefile.am
index 0a99682..fce1a0e 100644
--- a/testsuites/ada/sptests/sp12/Makefile.am
+++ b/testsuites/ada/sptests/sp12/Makefile.am
@@ -13,4 +13,3 @@ ada_sp12$(EXEEXT): sp12.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp12.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp13/Makefile.am b/testsuites/ada/sptests/sp13/Makefile.am
index 19a8ed2..01a6021 100644
--- a/testsuites/ada/sptests/sp13/Makefile.am
+++ b/testsuites/ada/sptests/sp13/Makefile.am
@@ -13,4 +13,3 @@ ada_sp13$(EXEEXT): sp13.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp13.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp14/Makefile.am b/testsuites/ada/sptests/sp14/Makefile.am
index 501cd32..2b6c12a 100644
--- a/testsuites/ada/sptests/sp14/Makefile.am
+++ b/testsuites/ada/sptests/sp14/Makefile.am
@@ -13,4 +13,3 @@ ada_sp14$(EXEEXT): sp14.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp14.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp15/Makefile.am b/testsuites/ada/sptests/sp15/Makefile.am
index e1fe83b..9462600 100644
--- a/testsuites/ada/sptests/sp15/Makefile.am
+++ b/testsuites/ada/sptests/sp15/Makefile.am
@@ -13,4 +13,3 @@ ada_sp15$(EXEEXT): sp15.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp15.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp16/Makefile.am b/testsuites/ada/sptests/sp16/Makefile.am
index 4959ca2..82576fc 100644
--- a/testsuites/ada/sptests/sp16/Makefile.am
+++ b/testsuites/ada/sptests/sp16/Makefile.am
@@ -13,4 +13,3 @@ ada_sp16$(EXEEXT): sp16.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp16.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp17/Makefile.am b/testsuites/ada/sptests/sp17/Makefile.am
index 9a5b2a3..8357d1c 100644
--- a/testsuites/ada/sptests/sp17/Makefile.am
+++ b/testsuites/ada/sptests/sp17/Makefile.am
@@ -13,4 +13,3 @@ ada_sp17$(EXEEXT): sp17.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp17.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp19/Makefile.am b/testsuites/ada/sptests/sp19/Makefile.am
index 27e7d7c..8a38c8c 100644
--- a/testsuites/ada/sptests/sp19/Makefile.am
+++ b/testsuites/ada/sptests/sp19/Makefile.am
@@ -17,4 +17,3 @@ ada_sp19$(EXEEXT): sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp19.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp20/Makefile.am b/testsuites/ada/sptests/sp20/Makefile.am
index de7b240..7b22ec8 100644
--- a/testsuites/ada/sptests/sp20/Makefile.am
+++ b/testsuites/ada/sptests/sp20/Makefile.am
@@ -13,4 +13,3 @@ ada_sp20$(EXEEXT): sp20.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp20.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp22/Makefile.am b/testsuites/ada/sptests/sp22/Makefile.am
index 8b24be6..dfdce80 100644
--- a/testsuites/ada/sptests/sp22/Makefile.am
+++ b/testsuites/ada/sptests/sp22/Makefile.am
@@ -13,4 +13,3 @@ ada_sp22$(EXEEXT): sp22.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp22.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp23/Makefile.am b/testsuites/ada/sptests/sp23/Makefile.am
index ccd4bfe..64c7746 100644
--- a/testsuites/ada/sptests/sp23/Makefile.am
+++ b/testsuites/ada/sptests/sp23/Makefile.am
@@ -13,4 +13,3 @@ ada_sp23$(EXEEXT): sp23.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp23.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp24/Makefile.am b/testsuites/ada/sptests/sp24/Makefile.am
index a8ebaec..7d9cbc8 100644
--- a/testsuites/ada/sptests/sp24/Makefile.am
+++ b/testsuites/ada/sptests/sp24/Makefile.am
@@ -13,4 +13,3 @@ ada_sp24$(EXEEXT): sp24.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp24.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/sp25/Makefile.am b/testsuites/ada/sptests/sp25/Makefile.am
index b4b864d..7cef185 100644
--- a/testsuites/ada/sptests/sp25/Makefile.am
+++ b/testsuites/ada/sptests/sp25/Makefile.am
@@ -13,4 +13,3 @@ ada_sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_sp25.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/spatcb01/Makefile.am b/testsuites/ada/sptests/spatcb01/Makefile.am
index 0e5dbaf..b27c692 100644
--- a/testsuites/ada/sptests/spatcb01/Makefile.am
+++ b/testsuites/ada/sptests/spatcb01/Makefile.am
@@ -13,4 +13,3 @@ ada_spatcb01$(EXEEXT): spatcb01.adb init.$(OBJEXT)
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_spatcb01.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/sptests/spname01/Makefile.am b/testsuites/ada/sptests/spname01/Makefile.am
index e011a95..b3cf506 100644
--- a/testsuites/ada/sptests/spname01/Makefile.am
+++ b/testsuites/ada/sptests/spname01/Makefile.am
@@ -15,4 +15,3 @@ init.$(OBJEXT): ../../support/init.c
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_spname01.scn
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/support/Makefile.am b/testsuites/ada/support/Makefile.am
index 52f61b9..8b13789 100644
--- a/testsuites/ada/support/Makefile.am
+++ b/testsuites/ada/support/Makefile.am
@@ -1,2 +1 @@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/Makefile.am b/testsuites/ada/tmtests/Makefile.am
index 4cf9517..ed9de68 100644
--- a/testsuites/ada/tmtests/Makefile.am
+++ b/testsuites/ada/tmtests/Makefile.am
@@ -30,4 +30,3 @@ _SUBDIRS += tmck
 _SUBDIRS += tmoverhd
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm01/Makefile.am b/testsuites/ada/tmtests/tm01/Makefile.am
index 4fb8798..249b65d 100644
--- a/testsuites/ada/tmtests/tm01/Makefile.am
+++ b/testsuites/ada/tmtests/tm01/Makefile.am
@@ -10,4 +10,3 @@ ada_tm01_SOURCES += ../../support/init.c
 ada_tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm02/Makefile.am b/testsuites/ada/tmtests/tm02/Makefile.am
index a35c094..3d4f79f 100644
--- a/testsuites/ada/tmtests/tm02/Makefile.am
+++ b/testsuites/ada/tmtests/tm02/Makefile.am
@@ -10,4 +10,3 @@ ada_tm02_SOURCES += ../../support/init.c
 ada_tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm03/Makefile.am b/testsuites/ada/tmtests/tm03/Makefile.am
index 81aa663..75032a2 100644
--- a/testsuites/ada/tmtests/tm03/Makefile.am
+++ b/testsuites/ada/tmtests/tm03/Makefile.am
@@ -10,4 +10,3 @@ ada_tm03_SOURCES += ../../support/init.c
 ada_tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm04/Makefile.am b/testsuites/ada/tmtests/tm04/Makefile.am
index 2aa62a7..da74604 100644
--- a/testsuites/ada/tmtests/tm04/Makefile.am
+++ b/testsuites/ada/tmtests/tm04/Makefile.am
@@ -10,4 +10,3 @@ ada_tm04_SOURCES += ../../support/init.c
 ada_tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm05/Makefile.am b/testsuites/ada/tmtests/tm05/Makefile.am
index 1d723e1..99829f3 100644
--- a/testsuites/ada/tmtests/tm05/Makefile.am
+++ b/testsuites/ada/tmtests/tm05/Makefile.am
@@ -10,4 +10,3 @@ ada_tm05_SOURCES += ../../support/init.c
 ada_tm05$(EXEEXT): tm05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm06/Makefile.am b/testsuites/ada/tmtests/tm06/Makefile.am
index a1e5edf..5dea7d4 100644
--- a/testsuites/ada/tmtests/tm06/Makefile.am
+++ b/testsuites/ada/tmtests/tm06/Makefile.am
@@ -10,4 +10,3 @@ ada_tm06_SOURCES += ../../support/init.c
 ada_tm06$(EXEEXT): tm06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm07/Makefile.am b/testsuites/ada/tmtests/tm07/Makefile.am
index 446c47d..2507454 100644
--- a/testsuites/ada/tmtests/tm07/Makefile.am
+++ b/testsuites/ada/tmtests/tm07/Makefile.am
@@ -10,4 +10,3 @@ ada_tm07_SOURCES += ../../support/init.c
 ada_tm07$(EXEEXT): tm07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm08/Makefile.am b/testsuites/ada/tmtests/tm08/Makefile.am
index 1b79606..0e21c0d 100644
--- a/testsuites/ada/tmtests/tm08/Makefile.am
+++ b/testsuites/ada/tmtests/tm08/Makefile.am
@@ -10,4 +10,3 @@ ada_tm08_SOURCES += ../../support/init.c
 ada_tm08$(EXEEXT): tm08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm09/Makefile.am b/testsuites/ada/tmtests/tm09/Makefile.am
index 02a2317..c18e062 100644
--- a/testsuites/ada/tmtests/tm09/Makefile.am
+++ b/testsuites/ada/tmtests/tm09/Makefile.am
@@ -10,4 +10,3 @@ ada_tm09_SOURCES += ../../support/init.c
 ada_tm09$(EXEEXT): tm09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm10/Makefile.am b/testsuites/ada/tmtests/tm10/Makefile.am
index 8becdcb..aa9b23f 100644
--- a/testsuites/ada/tmtests/tm10/Makefile.am
+++ b/testsuites/ada/tmtests/tm10/Makefile.am
@@ -10,4 +10,3 @@ ada_tm10_SOURCES += ../../support/init.c
 ada_tm10$(EXEEXT): tm10.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm11/Makefile.am b/testsuites/ada/tmtests/tm11/Makefile.am
index 8779d31..57f30eb 100644
--- a/testsuites/ada/tmtests/tm11/Makefile.am
+++ b/testsuites/ada/tmtests/tm11/Makefile.am
@@ -10,4 +10,3 @@ ada_tm11_SOURCES += ../../support/init.c
 ada_tm11$(EXEEXT): tm11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm12/Makefile.am b/testsuites/ada/tmtests/tm12/Makefile.am
index 477ee54..a1b8205 100644
--- a/testsuites/ada/tmtests/tm12/Makefile.am
+++ b/testsuites/ada/tmtests/tm12/Makefile.am
@@ -10,4 +10,3 @@ ada_tm12_SOURCES += ../../support/init.c
 ada_tm12$(EXEEXT): tm12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm13/Makefile.am b/testsuites/ada/tmtests/tm13/Makefile.am
index 9fc5961..8a0a8d9 100644
--- a/testsuites/ada/tmtests/tm13/Makefile.am
+++ b/testsuites/ada/tmtests/tm13/Makefile.am
@@ -10,4 +10,3 @@ ada_tm13_SOURCES += ../../support/init.c
 ada_tm13$(EXEEXT): tm13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm14/Makefile.am b/testsuites/ada/tmtests/tm14/Makefile.am
index bc5e7d0..d2cde84 100644
--- a/testsuites/ada/tmtests/tm14/Makefile.am
+++ b/testsuites/ada/tmtests/tm14/Makefile.am
@@ -10,4 +10,3 @@ ada_tm14_SOURCES += ../../support/init.c
 ada_tm14$(EXEEXT): tm14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm15/Makefile.am b/testsuites/ada/tmtests/tm15/Makefile.am
index e792c9b..9f94ba7 100644
--- a/testsuites/ada/tmtests/tm15/Makefile.am
+++ b/testsuites/ada/tmtests/tm15/Makefile.am
@@ -10,4 +10,3 @@ ada_tm15_SOURCES += ../../support/init.c
 ada_tm15$(EXEEXT): tm15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm16/Makefile.am b/testsuites/ada/tmtests/tm16/Makefile.am
index 9525797..8b7595b 100644
--- a/testsuites/ada/tmtests/tm16/Makefile.am
+++ b/testsuites/ada/tmtests/tm16/Makefile.am
@@ -10,4 +10,3 @@ ada_tm16_SOURCES += ../../support/init.c
 ada_tm16$(EXEEXT): tm16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm17/Makefile.am b/testsuites/ada/tmtests/tm17/Makefile.am
index d8715de..2e74d11 100644
--- a/testsuites/ada/tmtests/tm17/Makefile.am
+++ b/testsuites/ada/tmtests/tm17/Makefile.am
@@ -10,4 +10,3 @@ ada_tm17_SOURCES += ../../support/init.c
 ada_tm17$(EXEEXT): tm17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm18/Makefile.am b/testsuites/ada/tmtests/tm18/Makefile.am
index 62820c5..a61ec0e 100644
--- a/testsuites/ada/tmtests/tm18/Makefile.am
+++ b/testsuites/ada/tmtests/tm18/Makefile.am
@@ -10,4 +10,3 @@ ada_tm18_SOURCES += ../../support/init.c
 ada_tm18$(EXEEXT): tm18.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm19/Makefile.am b/testsuites/ada/tmtests/tm19/Makefile.am
index c21692b..f594559 100644
--- a/testsuites/ada/tmtests/tm19/Makefile.am
+++ b/testsuites/ada/tmtests/tm19/Makefile.am
@@ -10,4 +10,3 @@ ada_tm19_SOURCES += ../../support/init.c
 ada_tm19$(EXEEXT): tm19.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm20/Makefile.am b/testsuites/ada/tmtests/tm20/Makefile.am
index d4ca51d..71b7798 100644
--- a/testsuites/ada/tmtests/tm20/Makefile.am
+++ b/testsuites/ada/tmtests/tm20/Makefile.am
@@ -10,4 +10,3 @@ ada_tm20_SOURCES += ../../support/init.c
 ada_tm20$(EXEEXT): tm20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm21/Makefile.am b/testsuites/ada/tmtests/tm21/Makefile.am
index 37f4c6b..92fb9b3 100644
--- a/testsuites/ada/tmtests/tm21/Makefile.am
+++ b/testsuites/ada/tmtests/tm21/Makefile.am
@@ -10,4 +10,3 @@ ada_tm21_SOURCES += ../../support/init.c
 ada_tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm22/Makefile.am b/testsuites/ada/tmtests/tm22/Makefile.am
index a477b99..b40061c 100644
--- a/testsuites/ada/tmtests/tm22/Makefile.am
+++ b/testsuites/ada/tmtests/tm22/Makefile.am
@@ -10,4 +10,3 @@ ada_tm22_SOURCES += ../../support/init.c
 ada_tm22$(EXEEXT): tm22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm23/Makefile.am b/testsuites/ada/tmtests/tm23/Makefile.am
index 6ee7aa4..ab12b04 100644
--- a/testsuites/ada/tmtests/tm23/Makefile.am
+++ b/testsuites/ada/tmtests/tm23/Makefile.am
@@ -10,4 +10,3 @@ ada_tm23_SOURCES += ../../support/init.c
 ada_tm23$(EXEEXT): tm23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm24/Makefile.am b/testsuites/ada/tmtests/tm24/Makefile.am
index 9c7ec2e..da6caa8 100644
--- a/testsuites/ada/tmtests/tm24/Makefile.am
+++ b/testsuites/ada/tmtests/tm24/Makefile.am
@@ -10,4 +10,3 @@ ada_tm24_SOURCES += ../../support/init.c
 ada_tm24$(EXEEXT): tm24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm25/Makefile.am b/testsuites/ada/tmtests/tm25/Makefile.am
index db67df9..77f2286 100644
--- a/testsuites/ada/tmtests/tm25/Makefile.am
+++ b/testsuites/ada/tmtests/tm25/Makefile.am
@@ -10,4 +10,3 @@ ada_tm25_SOURCES += ../../support/init.c
 ada_tm25$(EXEEXT): tm25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm28/Makefile.am b/testsuites/ada/tmtests/tm28/Makefile.am
index eca1e00..a18cc54 100644
--- a/testsuites/ada/tmtests/tm28/Makefile.am
+++ b/testsuites/ada/tmtests/tm28/Makefile.am
@@ -10,4 +10,3 @@ ada_tm28_SOURCES += ../../support/init.c
 ada_tm28$(EXEEXT): tm28.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tm29/Makefile.am b/testsuites/ada/tmtests/tm29/Makefile.am
index d34b097..3b9c540 100644
--- a/testsuites/ada/tmtests/tm29/Makefile.am
+++ b/testsuites/ada/tmtests/tm29/Makefile.am
@@ -10,4 +10,3 @@ ada_tm29_SOURCES += ../../support/init.c
 ada_tm29$(EXEEXT): tm29.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tmck/Makefile.am b/testsuites/ada/tmtests/tmck/Makefile.am
index a2fa295..0c4ccd9 100644
--- a/testsuites/ada/tmtests/tmck/Makefile.am
+++ b/testsuites/ada/tmtests/tmck/Makefile.am
@@ -10,4 +10,3 @@ ada_tmck_SOURCES += ../../support/init.c
 ada_tmck$(EXEEXT): tmck.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/ada/tmtests/tmoverhd/Makefile.am b/testsuites/ada/tmtests/tmoverhd/Makefile.am
index 8bc56dd..e12637f 100644
--- a/testsuites/ada/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/ada/tmtests/tmoverhd/Makefile.am
@@ -11,4 +11,3 @@ ada_tmoverhd_SOURCES += ../../support/init.c
 ada_tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/automake/local.am b/testsuites/automake/local.am
deleted file mode 100644
index b87fd89..0000000
--- a/testsuites/automake/local.am
+++ /dev/null
@@ -1,5 +0,0 @@
-PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
-
-TEST_LD_FLAGS = -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar
-
-all-local: $(TMPINSTALL_FILES)
diff --git a/testsuites/benchmarks/Makefile.am b/testsuites/benchmarks/Makefile.am
index fe73c4b..895ffda 100644
--- a/testsuites/benchmarks/Makefile.am
+++ b/testsuites/benchmarks/Makefile.am
@@ -46,4 +46,3 @@ endif
 rtems_tests_PROGRAMS = $(benchmarks)
 dist_rtems_tests_DATA = $(benchmark_screens) $(benchmark_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/fstests/Makefile.am b/testsuites/fstests/Makefile.am
index 81ce635..83d3ae8 100644
--- a/testsuites/fstests/Makefile.am
+++ b/testsuites/fstests/Makefile.am
@@ -643,4 +643,3 @@ endif
 rtems_tests_PROGRAMS = $(fs_tests)
 dist_rtems_tests_DATA = $(fs_screens) $(fs_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 25c0499..52bbc3e 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -1299,4 +1299,3 @@ endif
 rtems_tests_PROGRAMS = $(lib_tests)
 dist_rtems_tests_DATA = $(lib_screens) $(lib_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/Makefile.am b/testsuites/mptests/Makefile.am
index 1841616..3624642 100644
--- a/testsuites/mptests/Makefile.am
+++ b/testsuites/mptests/Makefile.am
@@ -246,4 +246,3 @@ endif
 rtems_tests_PROGRAMS = $(mp_tests)
 dist_rtems_tests_DATA = $(mp_screens) $(mp_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp01/Makefile.am b/testsuites/mptests/mp01/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp01/Makefile.am
+++ b/testsuites/mptests/mp01/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp03/Makefile.am b/testsuites/mptests/mp03/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp03/Makefile.am
+++ b/testsuites/mptests/mp03/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp04/Makefile.am b/testsuites/mptests/mp04/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp04/Makefile.am
+++ b/testsuites/mptests/mp04/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp05/Makefile.am b/testsuites/mptests/mp05/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp05/Makefile.am
+++ b/testsuites/mptests/mp05/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp06/Makefile.am b/testsuites/mptests/mp06/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp06/Makefile.am
+++ b/testsuites/mptests/mp06/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp07/Makefile.am b/testsuites/mptests/mp07/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp07/Makefile.am
+++ b/testsuites/mptests/mp07/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp08/Makefile.am b/testsuites/mptests/mp08/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp08/Makefile.am
+++ b/testsuites/mptests/mp08/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp09/Makefile.am b/testsuites/mptests/mp09/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp09/Makefile.am
+++ b/testsuites/mptests/mp09/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp10/Makefile.am b/testsuites/mptests/mp10/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp10/Makefile.am
+++ b/testsuites/mptests/mp10/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp11/Makefile.am b/testsuites/mptests/mp11/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp11/Makefile.am
+++ b/testsuites/mptests/mp11/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp12/Makefile.am b/testsuites/mptests/mp12/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp12/Makefile.am
+++ b/testsuites/mptests/mp12/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp13/Makefile.am b/testsuites/mptests/mp13/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp13/Makefile.am
+++ b/testsuites/mptests/mp13/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp14/Makefile.am b/testsuites/mptests/mp14/Makefile.am
index 08a90da..f8a46ef 100644
--- a/testsuites/mptests/mp14/Makefile.am
+++ b/testsuites/mptests/mp14/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = node1 node2
 
 include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 2a18d54..3fadbec 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -1191,4 +1191,3 @@ rtems_tests_PROGRAMS = $(psx_tests)
 noinst_LIBRARIES = $(psx_lib)
 dist_rtems_tests_DATA = $(psx_screens) $(psx_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 51034ad..981417d 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -659,4 +659,3 @@ endif
 rtems_tests_PROGRAMS = $(psxtm_tests)
 dist_rtems_tests_DATA = $(psxtm_screens) $(psxtm_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/rhealstone/Makefile.am b/testsuites/rhealstone/Makefile.am
index dd55844..574c9cf 100644
--- a/testsuites/rhealstone/Makefile.am
+++ b/testsuites/rhealstone/Makefile.am
@@ -70,4 +70,3 @@ endif
 rtems_tests_PROGRAMS = $(rhealstones)
 dist_rtems_tests_DATA = $(rhealstone_screens) $(rhealstone_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am
index 0d3121a..280590d 100644
--- a/testsuites/samples/Makefile.am
+++ b/testsuites/samples/Makefile.am
@@ -159,4 +159,3 @@ endif
 rtems_tests_PROGRAMS = $(samples)
 dist_rtems_tests_DATA = $(sample_screens) $(sample_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/smptests/Makefile.am b/testsuites/smptests/Makefile.am
index 4c1750d..1ffa650 100644
--- a/testsuites/smptests/Makefile.am
+++ b/testsuites/smptests/Makefile.am
@@ -657,4 +657,3 @@ endif
 rtems_tests_PROGRAMS = $(smp_tests)
 dist_rtems_tests_DATA = $(smp_screens) $(smp_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 7574dba..7a18243 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -2056,4 +2056,3 @@ rtems_tests_PROGRAMS = $(sp_tests)
 noinst_LIBRARIES = $(sp_libs)
 dist_rtems_tests_DATA = $(sp_screens) $(sp_docs)
 
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/tmtests/Makefile.am b/testsuites/tmtests/Makefile.am
index b7fd67b..3c2509d 100644
--- a/testsuites/tmtests/Makefile.am
+++ b/testsuites/tmtests/Makefile.am
@@ -394,4 +394,3 @@ endif
 rtems_tests_PROGRAMS = $(tm_tests)
 dist_rtems_tests_DATA = $(tm_screens) $(tm_docs)
 
-include $(top_srcdir)/../automake/local.am



More information about the vc mailing list