Remove make preinstall

A speciality of the RTEMS build system was the make preinstall step.  It
copied header files from arbitrary locations into the build tree.  The
header files were included via the -Bsome/build/tree/path GCC command
line option.

This has at least seven problems:

* The make preinstall step itself needs time and disk space.

* Errors in header files show up in the build tree copy.  This makes it
  hard for editors to open the right file to fix the error.

* There is no clear relationship between source and build tree header
  files.  This makes an audit of the build process difficult.

* The visibility of all header files in the build tree makes it
  difficult to enforce API barriers.  For example it is discouraged to
  use BSP-specifics in the cpukit.

* An introduction of a new build system is difficult.

* Include paths specified by the -B option are system headers.  This
  may suppress warnings.

* The parallel build had sporadic failures on some hosts.

This patch removes the make preinstall step.   All installed header
files are moved to dedicated include directories in the source tree.
Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc,
etc.  Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g.
erc32, imx, qoriq, etc.

The new cpukit include directories are:

* cpukit/include

* cpukit/score/cpu/@RTEMS_CPU@/include

* cpukit/libnetworking

The new BSP include directories are:

* bsps/include

* bsps/@RTEMS_CPU@/include

* bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include

There are build tree include directories for generated files.

The include directory order favours the most general header file, e.g.
it is not possible to override general header files via the include path
order.

The "bootstrap -p" option was removed.  The new "bootstrap -H" option
should be used to regenerate the "headers.am" files.

Update #3254.

1 files changed, 0 insertions, 104 deletions

diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 5f8ee9f6c6..b56ce691bf 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -2,26 +2,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 
 include $(top_srcdir)/../../../automake/compile.am
 
-include_rtems_powerpcdir = $(includedir)/rtems/powerpc
-include_rtems_powerpc_HEADERS = rtems/powerpc/cache.h \
-    rtems/powerpc/debugmod.h rtems/powerpc/powerpc.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS = shared/include/powerpc-utility.h
-
-include_bspdir = $(includedir)/bsp
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += new-exceptions/bspsupport/irq_supp.h
-include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h
-
-include_mpc83xxdir = $(includedir)/mpc83xx
-
-include_mpc83xx_HEADERS =
-include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h
-
 EXTRA_DIST =
 
 noinst_PROGRAMS = new-exceptions/rtems-cpu.rel
@@ -66,17 +46,11 @@ EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_test.c
 
 # shared/include
 if shared
-include_libcpu_HEADERS += shared/include/io.h shared/include/mmu.h \
-    shared/include/page.h \
-    shared/include/byteorder.h shared/include/pgtable.h
-
 noinst_PROGRAMS += shared/cpuIdent.rel
 shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c shared/include/cpuIdent.h
 shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS)
 shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += shared/include/cpuIdent.h
-
 # shared/cache
 noinst_PROGRAMS += shared/cache.rel
 shared_cache_rel_SOURCES = shared/src/cache_.h \
@@ -91,8 +65,6 @@ shared_stack_rel_SOURCES = shared/src/stack.c shared/include/spr.h shared/src/st
 shared_stack_rel_CPPFLAGS = $(AM_CPPFLAGS)
 shared_stack_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += shared/include/spr.h
-include_libcpu_HEADERS += shared/src/stackTrace.h
 endif
 
 EXTRA_DIST += ppc403/README ppc403/vectors/README
@@ -113,7 +85,6 @@ endif
 ppc403_console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 ppc403_console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_HEADERS =
 shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c
 shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS)
 shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -126,8 +97,6 @@ ppc403_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # ppc403/tty_drv
 if ppc405
-include_HEADERS += ppc403/tty_drv/tty_drv.h
-
 noinst_PROGRAMS += ppc403/tty_drv.rel
 ppc403_tty_drv_rel_SOURCES = ppc403/tty_drv/tty_drv.c ppc403/tty_drv/tty_drv.h
 ppc403_tty_drv_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -139,20 +108,12 @@ endif # ppc4xx
 if ppc405
 
 ## ppc4xx/include
-include_ppc4xxdir = $(includedir)/ppc4xx
-include_ppc4xx_HEADERS = ppc403/include/ppc405gp.h \
-		         ppc403/include/ppc405ex.h
-
 endif # ppc405
 
 
 ## mpc5xx
 EXTRA_DIST += mpc5xx/README
 if mpc5xx
-include_mpc5xxdir = $(includedir)/mpc5xx
-
-include_HEADERS = mpc5xx/include/mpc5xx.h
-
 # mpc5xx/clock
 noinst_PROGRAMS += mpc5xx/clock.rel
 mpc5xx_clock_rel_SOURCES = mpc5xx/clock/clock.c
@@ -160,24 +121,18 @@ mpc5xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc5xx/console-generic
-include_mpc5xx_HEADERS = mpc5xx/include/console.h
-
 noinst_PROGRAMS += mpc5xx/console-generic.rel
 mpc5xx_console_generic_rel_SOURCES = mpc5xx/console-generic/console-generic.c
 mpc5xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc5xx/exceptions
-include_libcpu_HEADERS += mpc5xx/exceptions/raw_exception.h
-
 noinst_PROGRAMS += mpc5xx/exceptions.rel
 mpc5xx_exceptions_rel_SOURCES = mpc5xx/exceptions/raw_exception.c
 mpc5xx_exceptions_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_exceptions_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc5xx/irq
-include_libcpu_HEADERS += mpc5xx/irq/irq.h
-
 noinst_PROGRAMS += mpc5xx/irq.rel
 mpc5xx_irq_rel_SOURCES = mpc5xx/irq/irq.c mpc5xx/irq/irq_init.c mpc5xx/irq/irq_asm.S
 mpc5xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -190,8 +145,6 @@ mpc5xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc5xx/vectors
-include_libcpu_HEADERS += mpc5xx/vectors/vectors.h
-
 noinst_PROGRAMS += mpc5xx/vectors.rel
 mpc5xx_vectors_rel_SOURCES = mpc5xx/vectors/vectors_init.c mpc5xx/vectors/vectors.S \
     new-exceptions/bspsupport/ppc_exc_print.c
@@ -201,8 +154,6 @@ endif
 
 if mpc505
 # mpc505/ictrl
-include_HEADERS = mpc505/ictrl/ictrl.h
-
 noinst_PROGRAMS += mpc505/ictrl.rel
 mpc505_ictrl_rel_SOURCES = mpc505/ictrl/ictrl.c
 mpc505_ictrl_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -224,8 +175,6 @@ endif
 if mpc6xx
 
 # mpc6xx/mmu
-include_libcpu_HEADERS += mpc6xx/mmu/bat.h mpc6xx/mmu/pte121.h
-
 noinst_PROGRAMS += mpc6xx/mmu.rel
 mpc6xx_mmu_rel_SOURCES = mpc6xx/mmu/bat.c mpc6xx/mmu/bat.h \
     mpc6xx/mmu/pte121.c mpc6xx/mmu/pte121.h \
@@ -234,8 +183,6 @@ mpc6xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc6xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc6xx/clock
-include_libcpu_HEADERS += mpc6xx/clock/c_clock.h
-
 noinst_PROGRAMS += mpc6xx/clock.rel
 mpc6xx_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h
 mpc6xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -257,8 +204,6 @@ EXTRA_DIST      += mpc6xx/altivec/README
 
 # e500/clock
 if e500_clock
-include_libcpu_HEADERS += mpc6xx/clock/c_clock.h
-
 noinst_PROGRAMS += e500/clock.rel
 e500_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h
 e500_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -275,7 +220,6 @@ endif
 
 # e500/mmu
 if e500_mmu
-include_libcpu_HEADERS += e500/mmu/e500_mmu.h
 noinst_PROGRAMS += e500/mmu.rel
 e500_mmu_rel_SOURCES = e500/mmu/mmu.c e500/mmu/e500_mmu.h
 e500_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -284,10 +228,6 @@ endif
 
 EXTRA_DIST += mpc8xx/README
 if mpc8xx
-include_mpc8xxdir = $(includedir)/mpc8xx
-
-include_HEADERS = mpc8xx/include/mpc8xx.h
-
 # mpc8xx/clock
 noinst_PROGRAMS += mpc8xx/clock.rel
 mpc8xx_clock_rel_SOURCES = mpc8xx/clock/clock.c
@@ -295,24 +235,18 @@ mpc8xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8xx/console-generic
-include_mpc8xx_HEADERS = mpc8xx/include/console.h
-
 noinst_PROGRAMS += mpc8xx/console-generic.rel
 mpc8xx_console_generic_rel_SOURCES = mpc8xx/console-generic/console-generic.c
 mpc8xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8xx/cpm
-include_mpc8xx_HEADERS += mpc8xx/include/cpm.h
-
 noinst_PROGRAMS += mpc8xx/cpm.rel
 mpc8xx_cpm_rel_SOURCES = mpc8xx/cpm/cp.c mpc8xx/cpm/dpram.c
 mpc8xx_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8xx_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8xx/mmu
-include_mpc8xx_HEADERS += mpc8xx/include/mmu.h
-
 noinst_PROGRAMS += mpc8xx/mmu.rel
 mpc8xx_mmu_rel_SOURCES = mpc8xx/mmu/mmu.c
 mpc8xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -327,13 +261,7 @@ endif
 
 EXTRA_DIST += mpc8260/README
 if mpc8260
-include_mpc8260dir = $(includedir)/mpc8260
-
-include_HEADERS = mpc8260/include/mpc8260.h
-
 # mpc8260/console-generic
-include_mpc8260_HEADERS = mpc8260/include/console.h
-
 noinst_PROGRAMS += mpc8260/console-generic.rel
 mpc8260_console_generic_rel_SOURCES = mpc8260/console-generic/console-generic.c \
     mpc8260/include/console.h
@@ -341,8 +269,6 @@ mpc8260_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8260_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8260/cpm
-include_mpc8260_HEADERS += mpc8260/include/cpm.h
-
 noinst_PROGRAMS += mpc8260/cpm.rel
 mpc8260_cpm_rel_SOURCES = mpc8260/cpm/cp.c mpc8260/cpm/dpram.c mpc8260/cpm/brg.c \
     mpc8260/include/cpm.h
@@ -350,8 +276,6 @@ mpc8260_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8260_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8260/mmu
-include_mpc8260_HEADERS += mpc8260/include/mmu.h
-
 noinst_PROGRAMS += mpc8260/mmu.rel
 mpc8260_mmu_rel_SOURCES = mpc8260/mmu/mmu.c \
                           mpc8260/include/mmu.h
@@ -372,10 +296,7 @@ if mpc83xx
 
 # Includes
 
-include_mpc83xx_HEADERS += mpc83xx/include/mpc83xx.h
-
 # Network
-include_bsp_HEADERS += mpc83xx/network/tsec.h
 if HAS_NETWORKING
 noinst_PROGRAMS += mpc83xx/tsec.rel
 mpc83xx_tsec_rel_SOURCES = mpc83xx/network/tsec.c
@@ -390,14 +311,12 @@ mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \
 mpc83xx_i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # SPI
-include_mpc83xx_HEADERS += mpc83xx/spi/mpc83xx_spidrv.h
 noinst_PROGRAMS += mpc83xx/spi.rel
 mpc83xx_spi_rel_SOURCES = mpc83xx/spi/mpc83xx_spidrv.c \
 	mpc83xx/spi/mpc83xx_spidrv.h
 mpc83xx_spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # GTM
-include_mpc83xx_HEADERS += mpc83xx/include/gtm.h
 noinst_PROGRAMS += mpc83xx/gtm.rel
 mpc83xx_gtm_rel_SOURCES = mpc83xx/gtm/gtm.c \
 	mpc83xx/include/gtm.h
@@ -413,27 +332,6 @@ endif
 ##############################################################################
 if mpc55xx
 
-# Includes
-include_mpc55xxdir = $(includedir)/mpc55xx
-
-include_mpc55xx_HEADERS =
-include_mpc55xx_HEADERS += mpc55xx/include/regs.h
-include_mpc55xx_HEADERS += mpc55xx/include/reg-defs.h
-include_mpc55xx_HEADERS += mpc55xx/include/dspi.h
-include_mpc55xx_HEADERS += mpc55xx/include/edma.h
-include_mpc55xx_HEADERS += mpc55xx/include/emios.h
-include_mpc55xx_HEADERS += mpc55xx/include/mpc55xx.h
-include_mpc55xx_HEADERS += mpc55xx/include/siu.h
-include_mpc55xx_HEADERS += mpc55xx/include/watchdog.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc551x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc555x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc556x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc564xL.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc5668.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc567x.h
-include_mpc55xx_HEADERS += mpc55xx/include/regs-edma.h
-include_mpc55xx_HEADERS += mpc55xx/include/regs-mmu.h
-
 # IRQ
 noinst_PROGRAMS += mpc55xx/irq.rel
 mpc55xx_irq_rel_SOURCES = mpc55xx/irq/irq.c
@@ -487,7 +385,6 @@ endif
 if qoriq
 
 # Network
-include_bsp_HEADERS += mpc83xx/network/tsec.h
 if HAS_NETWORKING
 noinst_PROGRAMS += tsec.rel
 tsec_rel_SOURCES = mpc83xx/network/tsec.c
@@ -500,5 +397,4 @@ endif
 # END: QorIQ                                                                 #
 ##############################################################################
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am