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, 5 insertions, 87 deletions

diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index b73569d222..60e2a9044a 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -4,34 +4,25 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += include/leon.h
 
 EXTRA_DIST += ../../sparc/shared/start/start.S
 start.$(OBJEXT): ../../sparc/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.gr712rc
+dist_project_lib_DATA += startup/linkcmds.gr740
 dist_project_lib_DATA += startup/linkcmds.leon3
 dist_project_lib_DATA += startup/linkcmds.ut699
-dist_project_lib_DATA += startup/linkcmds.gr712rc
 dist_project_lib_DATA += startup/linkcmds.ut700
-dist_project_lib_DATA += startup/linkcmds.gr740
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -55,13 +46,7 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
 libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
 libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS += ../shared/include/gnatcommon.h
 # AMBA bus
-include_HEADERS += include/amba.h
-include_HEADERS += ../../sparc/shared/include/ambapp.h
-include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
-include_HEADERS += ../../sparc/shared/include/grlib.h
-include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h
 libbsp_a_SOURCES += amba/amba.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
@@ -76,8 +61,6 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
 
 # Clock Driver and Timer Library
-include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h
-include_bsp_HEADERS += ../../sparc/shared/include/tlib.h
 libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib_ckinit.c
@@ -90,17 +73,10 @@ libbsp_a_SOURCES += ../../shared/console-termios.c
 libbsp_a_SOURCES += console/console.c
 libbsp_a_SOURCES += ../../sparc/shared/uart/cons.c
 libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_cons.c
-include_bsp_HEADERS += ../../sparc/shared/include/cons.h
-include_bsp_HEADERS += ../../sparc/shared/include/apbuart_cons.h
 # debugio
 libbsp_a_SOURCES += console/printk_support.c
 
 # IRQ
-include_bsp_HEADERS += ../../sparc/shared/include/genirq.h
-include_bsp_HEADERS += \
-    ../../shared/include/irq-generic.h \
-    ../../shared/include/irq-info.h \
-    include/bsp/irq.h
 libbsp_a_SOURCES += \
     startup/eirq.c \
     ../../sparc/shared/irq/genirq.c  \
@@ -114,10 +90,6 @@ libbsp_a_SOURCES += \
     ../../shared/src/irq-shell.c
 
 # PCI
-include_bsp_HEADERS += ../../sparc/shared/include/grpci.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h
-include_bsp_HEADERS += ../../sparc/shared/include/pcif.h
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c
@@ -126,14 +98,6 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_le.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_be.c
 
 # PCI target devices
-include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_tmtc_1553.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_701.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_adcdac.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_io.c
@@ -144,122 +108,78 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_leon4_n2x.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_cpci_gr740.c
 
 # B1553BRM
-include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h
-include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
 
 # GR1553B
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
 
 # CAN
-include_bsp_HEADERS += ../../sparc/shared/include/occan.h \
-    ../../sparc/shared/include/grcan.h
 libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
     ../../sparc/shared/can/grcan.c
 
 # SpaceWire
 if !HAS_SMP
-include_bsp_HEADERS += ../../sparc/shared/include/grspw.h
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
 endif
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
 
 # UART
-include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h \
-    ../../sparc/shared/include/apbuart_termios.h
 libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_termios.c
 
 # I2CMST
-include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
 libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
 
 # SPI
-include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h
 libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
 
 # TIME
-include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grctm.h
 libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
 libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
 
 # GPIO
-include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h
-include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h
 libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
 libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
 
 # PWM
-include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h
 libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
 
 # ADC and DAC
-include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h
 libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
 
 # Memory controllers
 libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
-include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h
-
 # l2cache
 libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c
-include_bsp_HEADERS += ../../sparc/shared/include/l2c.h
-
 # griommu
 libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c
-include_bsp_HEADERS += ../../sparc/shared/include/griommu.h
-
 # timer
 libbsp_a_SOURCES += timer/timer.c
 libbsp_a_SOURCES += timer/watchdog.c
-include_bsp_HEADERS += include/watchdog.h
-
 # Cache
 libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
 libbsp_a_SOURCES += include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include
 
 # GR712
-include_bsp_HEADERS += ../../sparc/shared/include/grascs.h
-include_bsp_HEADERS += ../../sparc/shared/include/satcan.h 
-include_bsp_HEADERS += ../../sparc/shared/include/canmux.h
-include_bsp_HEADERS += ../../sparc/shared/include/grslink.h
 libbsp_a_SOURCES += ../../sparc/shared/ascs/grascs.c
 libbsp_a_SOURCES += ../../sparc/shared/can/satcan.c
 libbsp_a_SOURCES += ../../sparc/shared/can/canmux.c
 libbsp_a_SOURCES += ../../sparc/shared/slink/grslink.c
 
 # TM/TC
-include_bsp_HEADERS += ../../sparc/shared/include/grtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grtm.h
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
 
 # MEMSCRUB
 libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c
-include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h
-
 # L4STAT
 libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c
-include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h
-
 # Driver Manager 
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus_grlib.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/ambapp_bus.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_grlib.c
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/get_resarray_count.c
@@ -290,7 +210,6 @@ if !HAS_SMP
 libbsp_a_SOURCES += leon_greth/leon_greth.c
 endif
 leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-include_bsp_HEADERS += ../../sparc/shared/include/greth.h
 leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
 leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -298,7 +217,6 @@ endif
 
 # BSP Network configuration
 if HAS_NETWORKING
-include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h
 libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 endif
 
@@ -322,5 +240,5 @@ endif
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc/leon3/headers.am