diff options
author | Chris Johns <chrisj@rtems.org> | 2017-12-23 18:18:56 +1100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-25 08:45:26 +0100 |
commit | 2afb22b7e1ebcbe40373ff7e0efae7d207c655a9 (patch) | |
tree | 44759efe9374f13200a97e96d91bd9a2b7e5ce2a /c/src/lib/libcpu | |
parent | MAINTAINERS: Add myself to Write After Approval. (diff) | |
download | rtems-2afb22b7e1ebcbe40373ff7e0efae7d207c655a9.tar.bz2 |
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.
Diffstat (limited to '')
-rw-r--r-- | bsps/arm/include/libcpu/am335x.h (renamed from c/src/lib/libcpu/arm/shared/include/am335x.h) | 0 | ||||
-rw-r--r-- | bsps/arm/include/libcpu/mmu.h (renamed from c/src/lib/libcpu/arm/shared/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/arm/include/libcpu/omap3.h (renamed from c/src/lib/libcpu/arm/shared/include/omap3.h) | 0 | ||||
-rw-r--r-- | bsps/arm/include/libcpu/omap_timer.h (renamed from c/src/lib/libcpu/arm/shared/include/omap_timer.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/bf52x.h (renamed from c/src/lib/libcpu/bfin/bf52x/include/bf52x.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/bsp/interrupt.h (renamed from c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/bf533.h (renamed from c/src/lib/libcpu/bfin/include/bf533.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/bf537.h (renamed from c/src/lib/libcpu/bfin/include/bf537.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/cecRegs.h (renamed from c/src/lib/libcpu/bfin/include/cecRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/coreTimerRegs.h (renamed from c/src/lib/libcpu/bfin/include/coreTimerRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/dmaRegs.h (renamed from c/src/lib/libcpu/bfin/include/dmaRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/ebiuRegs.h (renamed from c/src/lib/libcpu/bfin/include/ebiuRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/ethernet.h (renamed from c/src/lib/libcpu/bfin/network/ethernet.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/ethernetRegs.h (renamed from c/src/lib/libcpu/bfin/include/ethernetRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/gpioRegs.h (renamed from c/src/lib/libcpu/bfin/include/gpioRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/interrupt.h (renamed from c/src/lib/libcpu/bfin/interrupt/interrupt.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/memoryRegs.h (renamed from c/src/lib/libcpu/bfin/include/memoryRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/mmu.h (renamed from c/src/lib/libcpu/bfin/mmu/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/mmuRegs.h (renamed from c/src/lib/libcpu/bfin/include/mmuRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/ppiRegs.h (renamed from c/src/lib/libcpu/bfin/include/ppiRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/rtcRegs.h (renamed from c/src/lib/libcpu/bfin/include/rtcRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/sicRegs.h (renamed from c/src/lib/libcpu/bfin/include/sicRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/spi.h (renamed from c/src/lib/libcpu/bfin/serial/spi.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/spiRegs.h (renamed from c/src/lib/libcpu/bfin/include/spiRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/sport.h (renamed from c/src/lib/libcpu/bfin/serial/sport.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/sportRegs.h (renamed from c/src/lib/libcpu/bfin/include/sportRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/timerRegs.h (renamed from c/src/lib/libcpu/bfin/include/timerRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/twi.h (renamed from c/src/lib/libcpu/bfin/serial/twi.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/twiRegs.h (renamed from c/src/lib/libcpu/bfin/include/twiRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/uart.h (renamed from c/src/lib/libcpu/bfin/serial/uart.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/uartRegs.h (renamed from c/src/lib/libcpu/bfin/include/uartRegs.h) | 0 | ||||
-rw-r--r-- | bsps/bfin/include/libcpu/wdogRegs.h (renamed from c/src/lib/libcpu/bfin/include/wdogRegs.h) | 0 | ||||
-rw-r--r-- | bsps/i386/include/libcpu/byteorder.h (renamed from c/src/lib/libcpu/i386/byteorder.h) | 0 | ||||
-rw-r--r-- | bsps/i386/include/libcpu/cpuModel.h (renamed from c/src/lib/libcpu/i386/cpuModel.h) | 0 | ||||
-rw-r--r-- | bsps/i386/include/libcpu/page.h (renamed from c/src/lib/libcpu/i386/page.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5206/mcf5206e.h (renamed from c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5206/mcfmbus.h (renamed from c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5206/mcfuart.h (renamed from c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5223x/mcf5223x.h (renamed from c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5225x/fec.h (renamed from c/src/lib/libcpu/m68k/mcf5225x/include/fec.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5225x/mcf5225x.h (renamed from c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5235/mcf5235.h (renamed from c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5272/mcf5272.h (renamed from c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf5282/mcf5282.h (renamed from c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf532x/mcf532x.h (renamed from c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf548x/MCD_dma.h (renamed from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf548x/MCD_progCheck.h (renamed from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf548x/MCD_tasksInit.h (renamed from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf548x/mcdma_glue.h (renamed from c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/include/mcf548x/mcf548x.h (renamed from c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h) | 0 | ||||
-rw-r--r-- | bsps/mips/include/libcpu/au1x00.h (renamed from c/src/lib/libcpu/mips/au1x00/include/au1x00.h) | 0 | ||||
-rw-r--r-- | bsps/mips/include/libcpu/isr_entries.h (renamed from c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h) | 0 | ||||
-rw-r--r-- | bsps/mips/include/libcpu/rm5231.h (renamed from c/src/lib/libcpu/mips/rm52xx/include/rm5231.h) | 0 | ||||
-rw-r--r-- | bsps/mips/include/libcpu/tx3904.h (renamed from c/src/lib/libcpu/mips/tx39/include/tx3904.h) | 0 | ||||
-rw-r--r-- | bsps/mips/include/libcpu/tx4925.h (renamed from c/src/lib/libcpu/mips/tx49/include/tx4925.h) | 0 | ||||
-rw-r--r-- | bsps/mips/include/libcpu/tx4938.h (renamed from c/src/lib/libcpu/mips/tx49/include/tx4938.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/irq_supp.h (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/tsec.h (renamed from c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/vectors.h (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/ictrl.h (renamed from c/src/lib/libcpu/powerpc/mpc505/ictrl/ictrl.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/bat.h (renamed from c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/byteorder.h (renamed from c/src/lib/libcpu/powerpc/shared/include/byteorder.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/c_clock.h (renamed from c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h) | 0 | ||||
-rwxr-xr-x | bsps/powerpc/include/libcpu/cpuIdent.h (renamed from c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/e500_mmu.h (renamed from c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/io.h (renamed from c/src/lib/libcpu/powerpc/shared/include/io.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/irq.h (renamed from c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/mmu.h (renamed from c/src/lib/libcpu/powerpc/shared/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/page.h (renamed from c/src/lib/libcpu/powerpc/shared/include/page.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/pgtable.h (renamed from c/src/lib/libcpu/powerpc/shared/include/pgtable.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/powerpc-utility.h (renamed from c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/pte121.h (renamed from c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/raw_exception.h (renamed from c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/spr.h (renamed from c/src/lib/libcpu/powerpc/shared/include/spr.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/stackTrace.h (renamed from c/src/lib/libcpu/powerpc/shared/src/stackTrace.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/libcpu/vectors.h (renamed from c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/dspi.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/edma.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/emios.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/fsl-mpc551x.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/fsl-mpc555x.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/fsl-mpc556x.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/fsl-mpc5668.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/fsl-mpc567x.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/mpc55xx.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/reg-defs.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/regs-edma.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/regs-mmu.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/regs.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/siu.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc55xx/watchdog.h (renamed from c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc5xx.h (renamed from c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc5xx/console.h (renamed from c/src/lib/libcpu/powerpc/mpc5xx/include/console.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc8260.h (renamed from c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc8260/console.h (renamed from c/src/lib/libcpu/powerpc/mpc8260/include/console.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc8260/cpm.h (renamed from c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc8260/mmu.h (renamed from c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc83xx/gtm.h (renamed from c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc83xx/mpc83xx.h (renamed from c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h (renamed from c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h (renamed from c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc8xx.h (renamed from c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc8xx/console.h (renamed from c/src/lib/libcpu/powerpc/mpc8xx/include/console.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc8xx/cpm.h (renamed from c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/mpc8xx/mmu.h (renamed from c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/ppc4xx/ppc405ex.h (renamed from c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/ppc4xx/ppc405gp.h (renamed from c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/rtems/powerpc/cache.h (renamed from c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/rtems/powerpc/debugmod.h (renamed from c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/rtems/powerpc/powerpc.h (renamed from c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/tty_drv.h (renamed from c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h) | 0 | ||||
-rw-r--r-- | bsps/sparc/include/libcpu/access.h (renamed from c/src/lib/libcpu/sparc/include/libcpu/access.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libcpu/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/preinstall.am | 30 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/Makefile.am | 37 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/preinstall.am | 146 | ||||
-rw-r--r-- | c/src/lib/libcpu/i386/Makefile.am | 6 | ||||
-rw-r--r-- | c/src/lib/libcpu/i386/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/i386/preinstall.am | 32 | ||||
-rw-r--r-- | c/src/lib/libcpu/lm32/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libcpu/lm32/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/lm32/preinstall.am | 7 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/Makefile.am | 29 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/preinstall.am | 127 | ||||
-rw-r--r-- | c/src/lib/libcpu/mips/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libcpu/mips/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/mips/preinstall.am | 48 | ||||
-rw-r--r-- | c/src/lib/libcpu/nios2/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libcpu/nios2/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/nios2/preinstall.am | 7 | ||||
-rw-r--r-- | c/src/lib/libcpu/or1k/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libcpu/or1k/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/or1k/preinstall.am | 7 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/Makefile.am | 104 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/preinstall.am | 320 | ||||
-rw-r--r-- | c/src/lib/libcpu/sparc/Makefile.am | 5 | ||||
-rw-r--r-- | c/src/lib/libcpu/sparc/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/sparc/preinstall.am | 24 | ||||
-rw-r--r-- | c/src/lib/libcpu/sparc64/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libcpu/sparc64/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/sparc64/preinstall.am | 7 |
147 files changed, 22 insertions, 965 deletions
diff --git a/c/src/lib/libcpu/arm/shared/include/am335x.h b/bsps/arm/include/libcpu/am335x.h index 367e97cae9..367e97cae9 100644 --- a/c/src/lib/libcpu/arm/shared/include/am335x.h +++ b/bsps/arm/include/libcpu/am335x.h diff --git a/c/src/lib/libcpu/arm/shared/include/mmu.h b/bsps/arm/include/libcpu/mmu.h index b82e838695..b82e838695 100644 --- a/c/src/lib/libcpu/arm/shared/include/mmu.h +++ b/bsps/arm/include/libcpu/mmu.h diff --git a/c/src/lib/libcpu/arm/shared/include/omap3.h b/bsps/arm/include/libcpu/omap3.h index 0cc43d6383..0cc43d6383 100644 --- a/c/src/lib/libcpu/arm/shared/include/omap3.h +++ b/bsps/arm/include/libcpu/omap3.h diff --git a/c/src/lib/libcpu/arm/shared/include/omap_timer.h b/bsps/arm/include/libcpu/omap_timer.h index ef8787a571..ef8787a571 100644 --- a/c/src/lib/libcpu/arm/shared/include/omap_timer.h +++ b/bsps/arm/include/libcpu/omap_timer.h diff --git a/c/src/lib/libcpu/bfin/bf52x/include/bf52x.h b/bsps/bfin/include/bf52x.h index 6c3d087c79..6c3d087c79 100644 --- a/c/src/lib/libcpu/bfin/bf52x/include/bf52x.h +++ b/bsps/bfin/include/bf52x.h diff --git a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h b/bsps/bfin/include/bsp/interrupt.h index 7a98775dd5..7a98775dd5 100644 --- a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h +++ b/bsps/bfin/include/bsp/interrupt.h diff --git a/c/src/lib/libcpu/bfin/include/bf533.h b/bsps/bfin/include/libcpu/bf533.h index 78cfaa0125..78cfaa0125 100644 --- a/c/src/lib/libcpu/bfin/include/bf533.h +++ b/bsps/bfin/include/libcpu/bf533.h diff --git a/c/src/lib/libcpu/bfin/include/bf537.h b/bsps/bfin/include/libcpu/bf537.h index 8ed235205f..8ed235205f 100644 --- a/c/src/lib/libcpu/bfin/include/bf537.h +++ b/bsps/bfin/include/libcpu/bf537.h diff --git a/c/src/lib/libcpu/bfin/include/cecRegs.h b/bsps/bfin/include/libcpu/cecRegs.h index 89564c6f70..89564c6f70 100644 --- a/c/src/lib/libcpu/bfin/include/cecRegs.h +++ b/bsps/bfin/include/libcpu/cecRegs.h diff --git a/c/src/lib/libcpu/bfin/include/coreTimerRegs.h b/bsps/bfin/include/libcpu/coreTimerRegs.h index c5b257783c..c5b257783c 100644 --- a/c/src/lib/libcpu/bfin/include/coreTimerRegs.h +++ b/bsps/bfin/include/libcpu/coreTimerRegs.h diff --git a/c/src/lib/libcpu/bfin/include/dmaRegs.h b/bsps/bfin/include/libcpu/dmaRegs.h index 7c895b7cab..7c895b7cab 100644 --- a/c/src/lib/libcpu/bfin/include/dmaRegs.h +++ b/bsps/bfin/include/libcpu/dmaRegs.h diff --git a/c/src/lib/libcpu/bfin/include/ebiuRegs.h b/bsps/bfin/include/libcpu/ebiuRegs.h index 1a07ff6985..1a07ff6985 100644 --- a/c/src/lib/libcpu/bfin/include/ebiuRegs.h +++ b/bsps/bfin/include/libcpu/ebiuRegs.h diff --git a/c/src/lib/libcpu/bfin/network/ethernet.h b/bsps/bfin/include/libcpu/ethernet.h index 0a8fc0c4b0..0a8fc0c4b0 100644 --- a/c/src/lib/libcpu/bfin/network/ethernet.h +++ b/bsps/bfin/include/libcpu/ethernet.h diff --git a/c/src/lib/libcpu/bfin/include/ethernetRegs.h b/bsps/bfin/include/libcpu/ethernetRegs.h index 7bf85c576b..7bf85c576b 100644 --- a/c/src/lib/libcpu/bfin/include/ethernetRegs.h +++ b/bsps/bfin/include/libcpu/ethernetRegs.h diff --git a/c/src/lib/libcpu/bfin/include/gpioRegs.h b/bsps/bfin/include/libcpu/gpioRegs.h index 02862916e1..02862916e1 100644 --- a/c/src/lib/libcpu/bfin/include/gpioRegs.h +++ b/bsps/bfin/include/libcpu/gpioRegs.h diff --git a/c/src/lib/libcpu/bfin/interrupt/interrupt.h b/bsps/bfin/include/libcpu/interrupt.h index 2c6b538bde..2c6b538bde 100644 --- a/c/src/lib/libcpu/bfin/interrupt/interrupt.h +++ b/bsps/bfin/include/libcpu/interrupt.h diff --git a/c/src/lib/libcpu/bfin/include/memoryRegs.h b/bsps/bfin/include/libcpu/memoryRegs.h index 130235e3d1..130235e3d1 100644 --- a/c/src/lib/libcpu/bfin/include/memoryRegs.h +++ b/bsps/bfin/include/libcpu/memoryRegs.h diff --git a/c/src/lib/libcpu/bfin/mmu/mmu.h b/bsps/bfin/include/libcpu/mmu.h index d6e2ea58a9..d6e2ea58a9 100644 --- a/c/src/lib/libcpu/bfin/mmu/mmu.h +++ b/bsps/bfin/include/libcpu/mmu.h diff --git a/c/src/lib/libcpu/bfin/include/mmuRegs.h b/bsps/bfin/include/libcpu/mmuRegs.h index 271ef4dcf5..271ef4dcf5 100644 --- a/c/src/lib/libcpu/bfin/include/mmuRegs.h +++ b/bsps/bfin/include/libcpu/mmuRegs.h diff --git a/c/src/lib/libcpu/bfin/include/ppiRegs.h b/bsps/bfin/include/libcpu/ppiRegs.h index 0ff301aefc..0ff301aefc 100644 --- a/c/src/lib/libcpu/bfin/include/ppiRegs.h +++ b/bsps/bfin/include/libcpu/ppiRegs.h diff --git a/c/src/lib/libcpu/bfin/include/rtcRegs.h b/bsps/bfin/include/libcpu/rtcRegs.h index 09245c2b91..09245c2b91 100644 --- a/c/src/lib/libcpu/bfin/include/rtcRegs.h +++ b/bsps/bfin/include/libcpu/rtcRegs.h diff --git a/c/src/lib/libcpu/bfin/include/sicRegs.h b/bsps/bfin/include/libcpu/sicRegs.h index 79fdd0d77c..79fdd0d77c 100644 --- a/c/src/lib/libcpu/bfin/include/sicRegs.h +++ b/bsps/bfin/include/libcpu/sicRegs.h diff --git a/c/src/lib/libcpu/bfin/serial/spi.h b/bsps/bfin/include/libcpu/spi.h index db8bfaa612..db8bfaa612 100644 --- a/c/src/lib/libcpu/bfin/serial/spi.h +++ b/bsps/bfin/include/libcpu/spi.h diff --git a/c/src/lib/libcpu/bfin/include/spiRegs.h b/bsps/bfin/include/libcpu/spiRegs.h index dcf792bb69..dcf792bb69 100644 --- a/c/src/lib/libcpu/bfin/include/spiRegs.h +++ b/bsps/bfin/include/libcpu/spiRegs.h diff --git a/c/src/lib/libcpu/bfin/serial/sport.h b/bsps/bfin/include/libcpu/sport.h index 6ed481b593..6ed481b593 100644 --- a/c/src/lib/libcpu/bfin/serial/sport.h +++ b/bsps/bfin/include/libcpu/sport.h diff --git a/c/src/lib/libcpu/bfin/include/sportRegs.h b/bsps/bfin/include/libcpu/sportRegs.h index f9f263b024..f9f263b024 100644 --- a/c/src/lib/libcpu/bfin/include/sportRegs.h +++ b/bsps/bfin/include/libcpu/sportRegs.h diff --git a/c/src/lib/libcpu/bfin/include/timerRegs.h b/bsps/bfin/include/libcpu/timerRegs.h index b66bae3339..b66bae3339 100644 --- a/c/src/lib/libcpu/bfin/include/timerRegs.h +++ b/bsps/bfin/include/libcpu/timerRegs.h diff --git a/c/src/lib/libcpu/bfin/serial/twi.h b/bsps/bfin/include/libcpu/twi.h index 2392ba532b..2392ba532b 100644 --- a/c/src/lib/libcpu/bfin/serial/twi.h +++ b/bsps/bfin/include/libcpu/twi.h diff --git a/c/src/lib/libcpu/bfin/include/twiRegs.h b/bsps/bfin/include/libcpu/twiRegs.h index c776f7886e..c776f7886e 100644 --- a/c/src/lib/libcpu/bfin/include/twiRegs.h +++ b/bsps/bfin/include/libcpu/twiRegs.h diff --git a/c/src/lib/libcpu/bfin/serial/uart.h b/bsps/bfin/include/libcpu/uart.h index 730e0e261f..730e0e261f 100644 --- a/c/src/lib/libcpu/bfin/serial/uart.h +++ b/bsps/bfin/include/libcpu/uart.h diff --git a/c/src/lib/libcpu/bfin/include/uartRegs.h b/bsps/bfin/include/libcpu/uartRegs.h index f48052e49b..f48052e49b 100644 --- a/c/src/lib/libcpu/bfin/include/uartRegs.h +++ b/bsps/bfin/include/libcpu/uartRegs.h diff --git a/c/src/lib/libcpu/bfin/include/wdogRegs.h b/bsps/bfin/include/libcpu/wdogRegs.h index 9e76d345b0..9e76d345b0 100644 --- a/c/src/lib/libcpu/bfin/include/wdogRegs.h +++ b/bsps/bfin/include/libcpu/wdogRegs.h diff --git a/c/src/lib/libcpu/i386/byteorder.h b/bsps/i386/include/libcpu/byteorder.h index 939e51fe84..939e51fe84 100644 --- a/c/src/lib/libcpu/i386/byteorder.h +++ b/bsps/i386/include/libcpu/byteorder.h diff --git a/c/src/lib/libcpu/i386/cpuModel.h b/bsps/i386/include/libcpu/cpuModel.h index d17839b7ea..d17839b7ea 100644 --- a/c/src/lib/libcpu/i386/cpuModel.h +++ b/bsps/i386/include/libcpu/cpuModel.h diff --git a/c/src/lib/libcpu/i386/page.h b/bsps/i386/include/libcpu/page.h index 5e9cec2227..5e9cec2227 100644 --- a/c/src/lib/libcpu/i386/page.h +++ b/bsps/i386/include/libcpu/page.h diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h b/bsps/m68k/include/mcf5206/mcf5206e.h index 06dadca9b1..06dadca9b1 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h +++ b/bsps/m68k/include/mcf5206/mcf5206e.h diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h b/bsps/m68k/include/mcf5206/mcfmbus.h index f70a70e483..f70a70e483 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h +++ b/bsps/m68k/include/mcf5206/mcfmbus.h diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h b/bsps/m68k/include/mcf5206/mcfuart.h index bd9df5bb56..bd9df5bb56 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h +++ b/bsps/m68k/include/mcf5206/mcfuart.h diff --git a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h b/bsps/m68k/include/mcf5223x/mcf5223x.h index 0886105b17..0886105b17 100644 --- a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h +++ b/bsps/m68k/include/mcf5223x/mcf5223x.h diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h b/bsps/m68k/include/mcf5225x/fec.h index 8d8d6c3763..8d8d6c3763 100644 --- a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h +++ b/bsps/m68k/include/mcf5225x/fec.h diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h b/bsps/m68k/include/mcf5225x/mcf5225x.h index ded447ffac..ded447ffac 100644 --- a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h +++ b/bsps/m68k/include/mcf5225x/mcf5225x.h diff --git a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h b/bsps/m68k/include/mcf5235/mcf5235.h index 87e0d91541..87e0d91541 100644 --- a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h +++ b/bsps/m68k/include/mcf5235/mcf5235.h diff --git a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h b/bsps/m68k/include/mcf5272/mcf5272.h index 37dae92d98..37dae92d98 100644 --- a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h +++ b/bsps/m68k/include/mcf5272/mcf5272.h diff --git a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h b/bsps/m68k/include/mcf5282/mcf5282.h index 3724f489de..3724f489de 100644 --- a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h +++ b/bsps/m68k/include/mcf5282/mcf5282.h diff --git a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h b/bsps/m68k/include/mcf532x/mcf532x.h index 798fb1175b..798fb1175b 100644 --- a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h +++ b/bsps/m68k/include/mcf532x/mcf532x.h diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h b/bsps/m68k/include/mcf548x/MCD_dma.h index ea6f8863cb..ea6f8863cb 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h +++ b/bsps/m68k/include/mcf548x/MCD_dma.h diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h b/bsps/m68k/include/mcf548x/MCD_progCheck.h index e0f578fdaf..e0f578fdaf 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h +++ b/bsps/m68k/include/mcf548x/MCD_progCheck.h diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h b/bsps/m68k/include/mcf548x/MCD_tasksInit.h index daf871cd6d..daf871cd6d 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h +++ b/bsps/m68k/include/mcf548x/MCD_tasksInit.h diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h b/bsps/m68k/include/mcf548x/mcdma_glue.h index de0621120f..de0621120f 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h +++ b/bsps/m68k/include/mcf548x/mcdma_glue.h diff --git a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h b/bsps/m68k/include/mcf548x/mcf548x.h index 7a9dc73698..7a9dc73698 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h +++ b/bsps/m68k/include/mcf548x/mcf548x.h diff --git a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h b/bsps/mips/include/libcpu/au1x00.h index a85a39ed48..a85a39ed48 100644 --- a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h +++ b/bsps/mips/include/libcpu/au1x00.h diff --git a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h b/bsps/mips/include/libcpu/isr_entries.h index e142018be7..e142018be7 100644 --- a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h +++ b/bsps/mips/include/libcpu/isr_entries.h diff --git a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h b/bsps/mips/include/libcpu/rm5231.h index c9ad3f9861..c9ad3f9861 100644 --- a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h +++ b/bsps/mips/include/libcpu/rm5231.h diff --git a/c/src/lib/libcpu/mips/tx39/include/tx3904.h b/bsps/mips/include/libcpu/tx3904.h index b573d3c7d9..b573d3c7d9 100644 --- a/c/src/lib/libcpu/mips/tx39/include/tx3904.h +++ b/bsps/mips/include/libcpu/tx3904.h diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4925.h b/bsps/mips/include/libcpu/tx4925.h index 56f58d9bf3..56f58d9bf3 100644 --- a/c/src/lib/libcpu/mips/tx49/include/tx4925.h +++ b/bsps/mips/include/libcpu/tx4925.h diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4938.h b/bsps/mips/include/libcpu/tx4938.h index 5005cc4149..5005cc4149 100644 --- a/c/src/lib/libcpu/mips/tx49/include/tx4938.h +++ b/bsps/mips/include/libcpu/tx4938.h diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h b/bsps/powerpc/include/bsp/irq_supp.h index 65af48c87f..65af48c87f 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h +++ b/bsps/powerpc/include/bsp/irq_supp.h diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h b/bsps/powerpc/include/bsp/tsec.h index 4efbfa2ab0..4efbfa2ab0 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h +++ b/bsps/powerpc/include/bsp/tsec.h diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h b/bsps/powerpc/include/bsp/vectors.h index 81526eb4b0..81526eb4b0 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h +++ b/bsps/powerpc/include/bsp/vectors.h diff --git a/c/src/lib/libcpu/powerpc/mpc505/ictrl/ictrl.h b/bsps/powerpc/include/ictrl.h index 303ece825d..303ece825d 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/ictrl/ictrl.h +++ b/bsps/powerpc/include/ictrl.h diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h b/bsps/powerpc/include/libcpu/bat.h index 2a27e810ee..2a27e810ee 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h +++ b/bsps/powerpc/include/libcpu/bat.h diff --git a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h b/bsps/powerpc/include/libcpu/byteorder.h index 0654fefb58..0654fefb58 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h +++ b/bsps/powerpc/include/libcpu/byteorder.h diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h b/bsps/powerpc/include/libcpu/c_clock.h index bd4918fb44..bd4918fb44 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h +++ b/bsps/powerpc/include/libcpu/c_clock.h diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h b/bsps/powerpc/include/libcpu/cpuIdent.h index e051deba92..e051deba92 100755 --- a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h +++ b/bsps/powerpc/include/libcpu/cpuIdent.h diff --git a/c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h b/bsps/powerpc/include/libcpu/e500_mmu.h index 84920e0d14..84920e0d14 100644 --- a/c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h +++ b/bsps/powerpc/include/libcpu/e500_mmu.h diff --git a/c/src/lib/libcpu/powerpc/shared/include/io.h b/bsps/powerpc/include/libcpu/io.h index 841df81f47..841df81f47 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/io.h +++ b/bsps/powerpc/include/libcpu/io.h diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h b/bsps/powerpc/include/libcpu/irq.h index ab06041d24..ab06041d24 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h +++ b/bsps/powerpc/include/libcpu/irq.h diff --git a/c/src/lib/libcpu/powerpc/shared/include/mmu.h b/bsps/powerpc/include/libcpu/mmu.h index d3081316eb..d3081316eb 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/mmu.h +++ b/bsps/powerpc/include/libcpu/mmu.h diff --git a/c/src/lib/libcpu/powerpc/shared/include/page.h b/bsps/powerpc/include/libcpu/page.h index 3efbdef5bc..3efbdef5bc 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/page.h +++ b/bsps/powerpc/include/libcpu/page.h diff --git a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h b/bsps/powerpc/include/libcpu/pgtable.h index 5be5874b4f..5be5874b4f 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h +++ b/bsps/powerpc/include/libcpu/pgtable.h diff --git a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h b/bsps/powerpc/include/libcpu/powerpc-utility.h index 4d6af38485..4d6af38485 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h +++ b/bsps/powerpc/include/libcpu/powerpc-utility.h diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h b/bsps/powerpc/include/libcpu/pte121.h index a07e063f03..a07e063f03 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h +++ b/bsps/powerpc/include/libcpu/pte121.h diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h b/bsps/powerpc/include/libcpu/raw_exception.h index dd0c483b0d..dd0c483b0d 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h +++ b/bsps/powerpc/include/libcpu/raw_exception.h diff --git a/c/src/lib/libcpu/powerpc/shared/include/spr.h b/bsps/powerpc/include/libcpu/spr.h index 6c81d0ee91..6c81d0ee91 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/spr.h +++ b/bsps/powerpc/include/libcpu/spr.h diff --git a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h b/bsps/powerpc/include/libcpu/stackTrace.h index f73dc2eff2..f73dc2eff2 100644 --- a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h +++ b/bsps/powerpc/include/libcpu/stackTrace.h diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h b/bsps/powerpc/include/libcpu/vectors.h index 2c8914e2a4..2c8914e2a4 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h +++ b/bsps/powerpc/include/libcpu/vectors.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h b/bsps/powerpc/include/mpc55xx/dspi.h index 8ad98274ef..8ad98274ef 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h +++ b/bsps/powerpc/include/mpc55xx/dspi.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h b/bsps/powerpc/include/mpc55xx/edma.h index 281cdf1c28..281cdf1c28 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h +++ b/bsps/powerpc/include/mpc55xx/edma.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h b/bsps/powerpc/include/mpc55xx/emios.h index d6ccadc07b..d6ccadc07b 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h +++ b/bsps/powerpc/include/mpc55xx/emios.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc551x.h index dec0b4cf73..dec0b4cf73 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h +++ b/bsps/powerpc/include/mpc55xx/fsl-mpc551x.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc555x.h index 0dea1957cf..0dea1957cf 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h +++ b/bsps/powerpc/include/mpc55xx/fsl-mpc555x.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc556x.h index 41ad83729a..41ad83729a 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h +++ b/bsps/powerpc/include/mpc55xx/fsl-mpc556x.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h b/bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h index 61217ac656..61217ac656 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h +++ b/bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h b/bsps/powerpc/include/mpc55xx/fsl-mpc5668.h index b7a1793dca..b7a1793dca 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h +++ b/bsps/powerpc/include/mpc55xx/fsl-mpc5668.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc567x.h index 31a132a096..31a132a096 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h +++ b/bsps/powerpc/include/mpc55xx/fsl-mpc567x.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h b/bsps/powerpc/include/mpc55xx/mpc55xx.h index 634be30e18..634be30e18 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h +++ b/bsps/powerpc/include/mpc55xx/mpc55xx.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h b/bsps/powerpc/include/mpc55xx/reg-defs.h index 2d66f6a8d0..2d66f6a8d0 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h +++ b/bsps/powerpc/include/mpc55xx/reg-defs.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h b/bsps/powerpc/include/mpc55xx/regs-edma.h index 804730ccd8..804730ccd8 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h +++ b/bsps/powerpc/include/mpc55xx/regs-edma.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h b/bsps/powerpc/include/mpc55xx/regs-mmu.h index e03047c4ad..e03047c4ad 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h +++ b/bsps/powerpc/include/mpc55xx/regs-mmu.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h b/bsps/powerpc/include/mpc55xx/regs.h index 3a4e737f1a..3a4e737f1a 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h +++ b/bsps/powerpc/include/mpc55xx/regs.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h b/bsps/powerpc/include/mpc55xx/siu.h index 3495750145..3495750145 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h +++ b/bsps/powerpc/include/mpc55xx/siu.h diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h b/bsps/powerpc/include/mpc55xx/watchdog.h index d5a8af794e..d5a8af794e 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h +++ b/bsps/powerpc/include/mpc55xx/watchdog.h diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h b/bsps/powerpc/include/mpc5xx.h index fc9b756cbf..fc9b756cbf 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h +++ b/bsps/powerpc/include/mpc5xx.h diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h b/bsps/powerpc/include/mpc5xx/console.h index c0633af938..c0633af938 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h +++ b/bsps/powerpc/include/mpc5xx/console.h diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h b/bsps/powerpc/include/mpc8260.h index ea088ebae8..ea088ebae8 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h +++ b/bsps/powerpc/include/mpc8260.h diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h b/bsps/powerpc/include/mpc8260/console.h index 049cef6d89..049cef6d89 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h +++ b/bsps/powerpc/include/mpc8260/console.h diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h b/bsps/powerpc/include/mpc8260/cpm.h index 31708a4199..31708a4199 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h +++ b/bsps/powerpc/include/mpc8260/cpm.h diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h b/bsps/powerpc/include/mpc8260/mmu.h index 9445dde3bc..9445dde3bc 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h +++ b/bsps/powerpc/include/mpc8260/mmu.h diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h b/bsps/powerpc/include/mpc83xx/gtm.h index a17510ed10..a17510ed10 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h +++ b/bsps/powerpc/include/mpc83xx/gtm.h diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h b/bsps/powerpc/include/mpc83xx/mpc83xx.h index 6f7417af1c..6f7417af1c 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h +++ b/bsps/powerpc/include/mpc83xx/mpc83xx.h diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h b/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h index 206cb87cb4..206cb87cb4 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h +++ b/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h b/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h index 92fe66831a..92fe66831a 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h +++ b/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h b/bsps/powerpc/include/mpc8xx.h index 3222e7fd03..3222e7fd03 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h +++ b/bsps/powerpc/include/mpc8xx.h diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h b/bsps/powerpc/include/mpc8xx/console.h index eea561e7eb..eea561e7eb 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h +++ b/bsps/powerpc/include/mpc8xx/console.h diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h b/bsps/powerpc/include/mpc8xx/cpm.h index 49889bdc32..49889bdc32 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h +++ b/bsps/powerpc/include/mpc8xx/cpm.h diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h b/bsps/powerpc/include/mpc8xx/mmu.h index f818b14be1..f818b14be1 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h +++ b/bsps/powerpc/include/mpc8xx/mmu.h diff --git a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h b/bsps/powerpc/include/ppc4xx/ppc405ex.h index 98ebbe28a2..98ebbe28a2 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h +++ b/bsps/powerpc/include/ppc4xx/ppc405ex.h diff --git a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h b/bsps/powerpc/include/ppc4xx/ppc405gp.h index 9cf46a780a..9cf46a780a 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h +++ b/bsps/powerpc/include/ppc4xx/ppc405gp.h diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h b/bsps/powerpc/include/rtems/powerpc/cache.h index 1fdc75ae8b..1fdc75ae8b 100644 --- a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h +++ b/bsps/powerpc/include/rtems/powerpc/cache.h diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h b/bsps/powerpc/include/rtems/powerpc/debugmod.h index 61b650695c..61b650695c 100644 --- a/c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h +++ b/bsps/powerpc/include/rtems/powerpc/debugmod.h diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h b/bsps/powerpc/include/rtems/powerpc/powerpc.h index 8b2cf1e371..8b2cf1e371 100644 --- a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h +++ b/bsps/powerpc/include/rtems/powerpc/powerpc.h diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h b/bsps/powerpc/include/tty_drv.h index d2024c89d7..d2024c89d7 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h +++ b/bsps/powerpc/include/tty_drv.h diff --git a/c/src/lib/libcpu/sparc/include/libcpu/access.h b/bsps/sparc/include/libcpu/access.h index cdf6b77122..cdf6b77122 100644 --- a/c/src/lib/libcpu/sparc/include/libcpu/access.h +++ b/bsps/sparc/include/libcpu/access.h diff --git a/c/src/lib/libcpu/Makefile.am b/c/src/lib/libcpu/Makefile.am index 38de255d1a..9cc2ece050 100644 --- a/c/src/lib/libcpu/Makefile.am +++ b/c/src/lib/libcpu/Makefile.am @@ -1,5 +1,3 @@ -include_libcpudir = $(includedir)/libcpu - EXTRA_DIST = EXTRA_DIST += shared/include/cache.h EXTRA_DIST += shared/src/cache_manager.c diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am index 7f76673cfd..35b08e2495 100644 --- a/c/src/lib/libcpu/arm/Makefile.am +++ b/c/src/lib/libcpu/arm/Makefile.am @@ -6,17 +6,9 @@ EXTRA_DIST = noinst_PROGRAMS = -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - -include_bsp_HEADERS = -include_libcpu_HEADERS = - ## shared/include if shared -include_libcpu_HEADERS += shared/include/mmu.h - ## shared/arm920 noinst_PROGRAMS += shared/arm920.rel shared_arm920_rel_SOURCES = shared/arm920/mmu.c @@ -24,5 +16,4 @@ shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac index c72c34eb19..a5e3e1cc88 100644 --- a/c/src/lib/libcpu/arm/configure.ac +++ b/c/src/lib/libcpu/arm/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-arm],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shared]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am deleted file mode 100644 index 31e0da295b..0000000000 --- a/c/src/lib/libcpu/arm/preinstall.am +++ /dev/null @@ -1,30 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES = $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -if shared -$(PROJECT_INCLUDE)/libcpu/mmu.h: shared/include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h -endif diff --git a/c/src/lib/libcpu/bfin/Makefile.am b/c/src/lib/libcpu/bfin/Makefile.am index 1dc90d481b..5f981657f7 100644 --- a/c/src/lib/libcpu/bfin/Makefile.am +++ b/c/src/lib/libcpu/bfin/Makefile.am @@ -6,21 +6,12 @@ EXTRA_DIST = noinst_PROGRAMS = -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - -include_bsp_HEADERS = -include_libcpu_HEADERS = - ############ # Start of bf52x files if bf52x -include_HEADERS = bf52x/include/bf52x.h - ## INTERRUPT -include_bsp_HEADERS += bf52x/interrupt/interrupt.h noinst_PROGRAMS += bf52x/interrupt.rel bf52x_interrupt_rel_SOURCES = bf52x/interrupt/interrupt.c \ bf52x/interrupt/interrupt.h @@ -31,33 +22,12 @@ endif # endof bf52x ############ -include_libcpu_HEADERS += include/bf533.h -include_libcpu_HEADERS += include/bf537.h -include_libcpu_HEADERS += include/cecRegs.h -include_libcpu_HEADERS += include/memoryRegs.h -include_libcpu_HEADERS += include/mmuRegs.h -include_libcpu_HEADERS += include/sicRegs.h -include_libcpu_HEADERS += include/ebiuRegs.h -include_libcpu_HEADERS += include/ppiRegs.h -include_libcpu_HEADERS += include/coreTimerRegs.h -include_libcpu_HEADERS += include/wdogRegs.h -include_libcpu_HEADERS += include/timerRegs.h -include_libcpu_HEADERS += include/dmaRegs.h -include_libcpu_HEADERS += include/ethernetRegs.h -include_libcpu_HEADERS += include/uartRegs.h -include_libcpu_HEADERS += include/sportRegs.h -include_libcpu_HEADERS += include/twiRegs.h -include_libcpu_HEADERS += include/spiRegs.h -include_libcpu_HEADERS += include/rtcRegs.h -include_libcpu_HEADERS += include/gpioRegs.h - noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache/cache.c \ ../shared/src/cache_manager.c cache/cache_.h cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += mmu/mmu.h noinst_PROGRAMS += mmu.rel mmu_rel_SOURCES = mmu/mmu.c mmu_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -66,7 +36,6 @@ mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if bf52x else -include_libcpu_HEADERS += interrupt/interrupt.h noinst_PROGRAMS += interrupt.rel interrupt_rel_SOURCES = interrupt/interrupt.c interrupt_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -84,25 +53,21 @@ rtc_rel_SOURCES = clock/rtc.c clock/rtc.h rtc_rel_CPPFLAGS = $(AM_CPPFLAGS) rtc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += serial/uart.h noinst_PROGRAMS += uart.rel uart_rel_SOURCES = serial/uart.c uart_rel_CPPFLAGS = $(AM_CPPFLAGS) uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += serial/sport.h noinst_PROGRAMS += sport.rel sport_rel_SOURCES = serial/sport.c sport_rel_CPPFLAGS = $(AM_CPPFLAGS) sport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += serial/spi.h noinst_PROGRAMS += spi.rel spi_rel_SOURCES = serial/spi.c spi_rel_CPPFLAGS = $(AM_CPPFLAGS) spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += serial/twi.h noinst_PROGRAMS += twi.rel twi_rel_SOURCES = serial/twi.c twi_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -115,7 +80,6 @@ timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING ## network -include_libcpu_HEADERS += network/ethernet.h network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ noinst_PROGRAMS += network.rel network_rel_SOURCES = network/ethernet.c @@ -123,5 +87,4 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/bfin/configure.ac b/c/src/lib/libcpu/bfin/configure.ac index 7888b083ea..4330957698 100644 --- a/c/src/lib/libcpu/bfin/configure.ac +++ b/c/src/lib/libcpu/bfin/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-bfin],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/bfin/preinstall.am b/c/src/lib/libcpu/bfin/preinstall.am deleted file mode 100644 index c7298742e3..0000000000 --- a/c/src/lib/libcpu/bfin/preinstall.am +++ /dev/null @@ -1,146 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES = $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -if bf52x -$(PROJECT_INCLUDE)/bf52x.h: bf52x/include/bf52x.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bf52x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bf52x.h - -$(PROJECT_INCLUDE)/bsp/interrupt.h: bf52x/interrupt/interrupt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/interrupt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/interrupt.h -endif -$(PROJECT_INCLUDE)/libcpu/bf533.h: include/bf533.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bf533.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bf533.h - -$(PROJECT_INCLUDE)/libcpu/bf537.h: include/bf537.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bf537.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bf537.h - -$(PROJECT_INCLUDE)/libcpu/cecRegs.h: include/cecRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cecRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cecRegs.h - -$(PROJECT_INCLUDE)/libcpu/memoryRegs.h: include/memoryRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/memoryRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/memoryRegs.h - -$(PROJECT_INCLUDE)/libcpu/mmuRegs.h: include/mmuRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmuRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmuRegs.h - -$(PROJECT_INCLUDE)/libcpu/sicRegs.h: include/sicRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sicRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sicRegs.h - -$(PROJECT_INCLUDE)/libcpu/ebiuRegs.h: include/ebiuRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ebiuRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ebiuRegs.h - -$(PROJECT_INCLUDE)/libcpu/ppiRegs.h: include/ppiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ppiRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ppiRegs.h - -$(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h: include/coreTimerRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h - -$(PROJECT_INCLUDE)/libcpu/wdogRegs.h: include/wdogRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/wdogRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/wdogRegs.h - -$(PROJECT_INCLUDE)/libcpu/timerRegs.h: include/timerRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/timerRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/timerRegs.h - -$(PROJECT_INCLUDE)/libcpu/dmaRegs.h: include/dmaRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/dmaRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/dmaRegs.h - -$(PROJECT_INCLUDE)/libcpu/ethernetRegs.h: include/ethernetRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ethernetRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ethernetRegs.h - -$(PROJECT_INCLUDE)/libcpu/uartRegs.h: include/uartRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/uartRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/uartRegs.h - -$(PROJECT_INCLUDE)/libcpu/sportRegs.h: include/sportRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sportRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sportRegs.h - -$(PROJECT_INCLUDE)/libcpu/twiRegs.h: include/twiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/twiRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/twiRegs.h - -$(PROJECT_INCLUDE)/libcpu/spiRegs.h: include/spiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spiRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spiRegs.h - -$(PROJECT_INCLUDE)/libcpu/rtcRegs.h: include/rtcRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/rtcRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/rtcRegs.h - -$(PROJECT_INCLUDE)/libcpu/gpioRegs.h: include/gpioRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/gpioRegs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/gpioRegs.h - -$(PROJECT_INCLUDE)/libcpu/mmu.h: mmu/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h - -if bf52x -else -$(PROJECT_INCLUDE)/libcpu/interrupt.h: interrupt/interrupt.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/interrupt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/interrupt.h -endif -$(PROJECT_INCLUDE)/libcpu/uart.h: serial/uart.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/uart.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/uart.h - -$(PROJECT_INCLUDE)/libcpu/sport.h: serial/sport.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sport.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sport.h - -$(PROJECT_INCLUDE)/libcpu/spi.h: serial/spi.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spi.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spi.h - -$(PROJECT_INCLUDE)/libcpu/twi.h: serial/twi.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/twi.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/twi.h - -if HAS_NETWORKING -$(PROJECT_INCLUDE)/libcpu/ethernet.h: network/ethernet.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ethernet.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ethernet.h -endif diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index c47b9dfc39..6f1e9fe3ec 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -4,11 +4,6 @@ noinst_PROGRAMS = include $(top_srcdir)/../../../automake/compile.am -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = page.h cpuModel.h -include_libcpu_HEADERS += byteorder.h - noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache.c cache_.h \ ../shared/src/cache_manager.c ../shared/include/cache.h @@ -25,5 +20,4 @@ page_rel_SOURCES = page.c page.h page_rel_CPPFLAGS = $(AM_CPPFLAGS) page_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/i386/configure.ac b/c/src/lib/libcpu/i386/configure.ac index e03af4824a..3f0f59543a 100644 --- a/c/src/lib/libcpu/i386/configure.ac +++ b/c/src/lib/libcpu/i386/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-i386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([idtr.S]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/i386/preinstall.am b/c/src/lib/libcpu/i386/preinstall.am deleted file mode 100644 index 1e6c1dfdba..0000000000 --- a/c/src/lib/libcpu/i386/preinstall.am +++ /dev/null @@ -1,32 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES = $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/page.h: page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h - -$(PROJECT_INCLUDE)/libcpu/cpuModel.h: cpuModel.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuModel.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuModel.h - -$(PROJECT_INCLUDE)/libcpu/byteorder.h: byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h - diff --git a/c/src/lib/libcpu/lm32/Makefile.am b/c/src/lib/libcpu/lm32/Makefile.am index 5de23de6cb..1e609cabf6 100644 --- a/c/src/lib/libcpu/lm32/Makefile.am +++ b/c/src/lib/libcpu/lm32/Makefile.am @@ -21,6 +21,5 @@ shared_misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(LM32_CPPFLAGS) shared_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/lm32/configure.ac b/c/src/lib/libcpu/lm32/configure.ac index 53a2e4bcf4..295ae91ee2 100644 --- a/c/src/lib/libcpu/lm32/configure.ac +++ b/c/src/lib/libcpu/lm32/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-lm32],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/lm32/preinstall.am b/c/src/lib/libcpu/lm32/preinstall.am deleted file mode 100644 index dba6cc4d81..0000000000 --- a/c/src/lib/libcpu/lm32/preinstall.am +++ /dev/null @@ -1,7 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am index 18724352d6..2800e421c4 100644 --- a/c/src/lib/libcpu/m68k/Makefile.am +++ b/c/src/lib/libcpu/m68k/Makefile.am @@ -67,10 +67,6 @@ EXTRA_DIST = m68040/fpsp/README if mcf5206 # mcf5206/include -include_mcf5206dir = $(includedir)/mcf5206 -include_mcf5206_HEADERS = mcf5206/include/mcf5206e.h mcf5206/include/mcfmbus.h \ - mcf5206/include/mcfuart.h - ## mcf5206/clock noinst_PROGRAMS += mcf5206/clock.rel mcf5206_clock_rel_SOURCES = mcf5206/clock/ckinit.c @@ -98,9 +94,6 @@ endif if mcf5223x ## mcf5223x/include -include_mcf5223xdir = $(includedir)/mcf5223x -include_mcf5223x_HEADERS = mcf5223x/include/mcf5223x.h - ## mcf5223x/cache noinst_PROGRAMS += mcf5223x/cachepd.rel mcf5223x_cachepd_rel_SOURCES = mcf5223x/cache/cachepd.c @@ -110,9 +103,6 @@ endif if mcf5225x ## mcf5225x/include -include_mcf5225xdir = $(includedir)/mcf5225x -include_mcf5225x_HEADERS = mcf5225x/include/mcf5225x.h - # mcf5225x/cache noinst_PROGRAMS += mcf5225x/cachepd.rel mcf5225x_cachepd_rel_SOURCES = mcf5225x/cache/cachepd.c @@ -121,15 +111,11 @@ mcf5225x_cachepd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # Network if HAS_NETWORKING -include_mcf5225x_HEADERS += mcf5225x/include/fec.h endif ## HAS_NETWORKING endif if mcf5235 ## mcf5235/include -include_mcf5235dir = $(includedir)/mcf5235 -include_mcf5235_HEADERS = mcf5235/include/mcf5235.h - ## mcf5235/cache noinst_PROGRAMS += mcf5235/cachepd.rel mcf5235_cachepd_rel_SOURCES = mcf5235/cache/cachepd.c @@ -139,9 +125,6 @@ endif if mcf532x ## mcf532x/include -include_mcf532xdir = $(includedir)/mcf532x -include_mcf532x_HEADERS = mcf532x/include/mcf532x.h - ## mcf532x/cache noinst_PROGRAMS += mcf532x/cachepd.rel mcf532x_cachepd_rel_SOURCES = mcf532x/cache/cachepd.c @@ -151,9 +134,6 @@ endif if mcf5272 ## mcf5272/include -include_mcf5272dir = $(includedir)/mcf5272 -include_mcf5272_HEADERS = mcf5272/include/mcf5272.h - ## clock noinst_PROGRAMS += mcf5272/clock.rel mcf5272_clock_rel_SOURCES = mcf5272/clock/ckinit.c @@ -169,9 +149,6 @@ endif if mcf5282 ## mcf5282/include -include_mcf5282dir = $(includedir)/mcf5282 -include_mcf5282_HEADERS = mcf5282/include/mcf5282.h - noinst_PROGRAMS += mcf5282/cachepd.rel mcf5282_cachepd_rel_SOURCES = mcf5282/cache/cachepd.c mcf5282_cachepd_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache @@ -180,13 +157,8 @@ endif if mcf548x ## mcf548x/include -include_mcf548xdir = $(includedir)/mcf548x -include_mcf548x_HEADERS = mcf548x/include/mcf548x.h - ## mcf548x/mcdma noinst_PROGRAMS += mcf548x/mcdma.rel -include_mcf548x_HEADERS += mcf548x/mcdma/MCD_progCheck.h mcf548x/mcdma/MCD_dma.h \ - mcf548x/mcdma/MCD_tasksInit.h mcf548x/mcdma/mcdma_glue.h mcf548x_mcdma_rel_SOURCES = mcf548x/mcdma/MCD_dmaApi.c mcf548x/mcdma/MCD_tasksInit.c \ mcf548x/mcdma/MCD_tasks.c mcf548x/mcdma/mcdma_glue.c @@ -194,5 +166,4 @@ mcf548x_mcdma_rel_CPPFLAGS = $(AM_CPPFLAGS) mcf548x_mcdma_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/configure.ac b/c/src/lib/libcpu/m68k/configure.ac index 99596c1a3e..5f24e9efd4 100644 --- a/c/src/lib/libcpu/m68k/configure.ac +++ b/c/src/lib/libcpu/m68k/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([m68040]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/m68k/preinstall.am b/c/src/lib/libcpu/m68k/preinstall.am deleted file mode 100644 index 258f0cb6ca..0000000000 --- a/c/src/lib/libcpu/m68k/preinstall.am +++ /dev/null @@ -1,127 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES = $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -if shared -endif -if mcf5206 -$(PROJECT_INCLUDE)/mcf5206/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5206 - @: > $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) - -$(PROJECT_INCLUDE)/mcf5206/mcf5206e.h: mcf5206/include/mcf5206e.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h - -$(PROJECT_INCLUDE)/mcf5206/mcfmbus.h: mcf5206/include/mcfmbus.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfmbus.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfmbus.h - -$(PROJECT_INCLUDE)/mcf5206/mcfuart.h: mcf5206/include/mcfuart.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfuart.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfuart.h -endif -if mcf5223x -$(PROJECT_INCLUDE)/mcf5223x/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5223x - @: > $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp) - -$(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h: mcf5223x/include/mcf5223x.h $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h -endif -if mcf5225x -$(PROJECT_INCLUDE)/mcf5225x/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5225x - @: > $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp) - -$(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h: mcf5225x/include/mcf5225x.h $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h - -if HAS_NETWORKING -$(PROJECT_INCLUDE)/mcf5225x/fec.h: mcf5225x/include/fec.h $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5225x/fec.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5225x/fec.h -endif ## HAS_NETWORKING -endif -if mcf5235 -$(PROJECT_INCLUDE)/mcf5235/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5235 - @: > $(PROJECT_INCLUDE)/mcf5235/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5235/$(dirstamp) - -$(PROJECT_INCLUDE)/mcf5235/mcf5235.h: mcf5235/include/mcf5235.h $(PROJECT_INCLUDE)/mcf5235/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5235/mcf5235.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5235/mcf5235.h -endif -if mcf532x -$(PROJECT_INCLUDE)/mcf532x/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf532x - @: > $(PROJECT_INCLUDE)/mcf532x/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf532x/$(dirstamp) - -$(PROJECT_INCLUDE)/mcf532x/mcf532x.h: mcf532x/include/mcf532x.h $(PROJECT_INCLUDE)/mcf532x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf532x/mcf532x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf532x/mcf532x.h -endif -if mcf5272 -$(PROJECT_INCLUDE)/mcf5272/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5272 - @: > $(PROJECT_INCLUDE)/mcf5272/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5272/$(dirstamp) - -$(PROJECT_INCLUDE)/mcf5272/mcf5272.h: mcf5272/include/mcf5272.h $(PROJECT_INCLUDE)/mcf5272/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5272/mcf5272.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5272/mcf5272.h -endif -if mcf5282 -$(PROJECT_INCLUDE)/mcf5282/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5282 - @: > $(PROJECT_INCLUDE)/mcf5282/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5282/$(dirstamp) - -$(PROJECT_INCLUDE)/mcf5282/mcf5282.h: mcf5282/include/mcf5282.h $(PROJECT_INCLUDE)/mcf5282/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5282/mcf5282.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5282/mcf5282.h -endif -if mcf548x -$(PROJECT_INCLUDE)/mcf548x/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf548x - @: > $(PROJECT_INCLUDE)/mcf548x/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf548x/$(dirstamp) - -$(PROJECT_INCLUDE)/mcf548x/mcf548x.h: mcf548x/include/mcf548x.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/mcf548x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/mcf548x.h - -$(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h: mcf548x/mcdma/MCD_progCheck.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h - -$(PROJECT_INCLUDE)/mcf548x/MCD_dma.h: mcf548x/mcdma/MCD_dma.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_dma.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_dma.h - -$(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h: mcf548x/mcdma/MCD_tasksInit.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h - -$(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h: mcf548x/mcdma/mcdma_glue.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h -endif diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am index 2630fc29d7..84dc521fac 100644 --- a/c/src/lib/libcpu/mips/Makefile.am +++ b/c/src/lib/libcpu/mips/Makefile.am @@ -7,10 +7,6 @@ EXTRA_DIST = noinst_PROGRAMS = ## cache -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = - noinst_PROGRAMS += shared/cache.rel shared_cache_rel_SOURCES = shared/cache/cache.c \ ../shared/src/cache_manager.c shared/cache/cache_.h @@ -36,15 +32,10 @@ shared_interrupts_rel_SOURCES = shared/interrupts/installisrentries.c \ shared/interrupts/isr_entries.S shared/interrupts/isr_entries.h shared_interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(interrupts_CPPFLAGS) shared_interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += shared/interrupts/isr_entries.h - if tx39 -include_libcpu_HEADERS += tx39/include/tx3904.h endif if tx49 -include_libcpu_HEADERS += tx49/include/tx4925.h tx49/include/tx4938.h - noinst_PROGRAMS += tx49/timer.rel tx49_timer_rel_SOURCES = timer/timer.c timer/gettime.S tx49_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) @@ -52,18 +43,13 @@ tx49_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif if au1x00 -include_libcpu_HEADERS += au1x00/include/au1x00.h - endif if rm52xx -include_libcpu_HEADERS += rm52xx/include/rm5231.h - noinst_PROGRAMS += rm52xx/timer.rel rm52xx_timer_rel_SOURCES = timer/timer.c timer/gettime.S rm52xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) rm52xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac index 324dd312f7..6a9e2665d9 100644 --- a/c/src/lib/libcpu/mips/configure.ac +++ b/c/src/lib/libcpu/mips/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([timer]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/mips/preinstall.am b/c/src/lib/libcpu/mips/preinstall.am deleted file mode 100644 index 6d302e501b..0000000000 --- a/c/src/lib/libcpu/mips/preinstall.am +++ /dev/null @@ -1,48 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES = $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/isr_entries.h: shared/interrupts/isr_entries.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/isr_entries.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/isr_entries.h - -if tx39 -$(PROJECT_INCLUDE)/libcpu/tx3904.h: tx39/include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h -endif -if tx49 -$(PROJECT_INCLUDE)/libcpu/tx4925.h: tx49/include/tx4925.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx4925.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx4925.h - -$(PROJECT_INCLUDE)/libcpu/tx4938.h: tx49/include/tx4938.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx4938.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx4938.h -endif -if au1x00 -$(PROJECT_INCLUDE)/libcpu/au1x00.h: au1x00/include/au1x00.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/au1x00.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/au1x00.h -endif -if rm52xx -$(PROJECT_INCLUDE)/libcpu/rm5231.h: rm52xx/include/rm5231.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/rm5231.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/rm5231.h -endif diff --git a/c/src/lib/libcpu/nios2/Makefile.am b/c/src/lib/libcpu/nios2/Makefile.am index fee88258c7..7641afb335 100644 --- a/c/src/lib/libcpu/nios2/Makefile.am +++ b/c/src/lib/libcpu/nios2/Makefile.am @@ -22,6 +22,5 @@ shared_misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(NIOS2_CPPFLAGS) shared_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/nios2/configure.ac b/c/src/lib/libcpu/nios2/configure.ac index c37ad5509e..ce7fe1b4e9 100644 --- a/c/src/lib/libcpu/nios2/configure.ac +++ b/c/src/lib/libcpu/nios2/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/nios2/preinstall.am b/c/src/lib/libcpu/nios2/preinstall.am deleted file mode 100644 index dba6cc4d81..0000000000 --- a/c/src/lib/libcpu/nios2/preinstall.am +++ /dev/null @@ -1,7 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - diff --git a/c/src/lib/libcpu/or1k/Makefile.am b/c/src/lib/libcpu/or1k/Makefile.am index 9c9921a100..e34d580982 100644 --- a/c/src/lib/libcpu/or1k/Makefile.am +++ b/c/src/lib/libcpu/or1k/Makefile.am @@ -12,6 +12,5 @@ shared_cache_rel_SOURCES = shared/cache/cache.c ../shared/src/cache_manager.c shared_cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache shared_cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/or1k/configure.ac b/c/src/lib/libcpu/or1k/configure.ac index a089a82838..80c67b63c3 100644 --- a/c/src/lib/libcpu/or1k/configure.ac +++ b/c/src/lib/libcpu/or1k/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-or1k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/or1k/preinstall.am b/c/src/lib/libcpu/or1k/preinstall.am deleted file mode 100644 index dba6cc4d81..0000000000 --- a/c/src/lib/libcpu/or1k/preinstall.am +++ /dev/null @@ -1,7 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - 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 diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac index 81e6bfab2c..ba654372f1 100644 --- a/c/src/lib/libcpu/powerpc/configure.ac +++ b/c/src/lib/libcpu/powerpc/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([mpc6xx]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/powerpc/preinstall.am b/c/src/lib/libcpu/powerpc/preinstall.am deleted file mode 100644 index 178763b3ab..0000000000 --- a/c/src/lib/libcpu/powerpc/preinstall.am +++ /dev/null @@ -1,320 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES = $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/powerpc - @: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/powerpc/cache.h: rtems/powerpc/cache.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/cache.h - -$(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h: rtems/powerpc/debugmod.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h - -$(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h: rtems/powerpc/powerpc.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h - -$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score - @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/powerpc-utility.h: shared/include/powerpc-utility.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/powerpc-utility.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/powerpc-utility.h - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/irq_supp.h: new-exceptions/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h - -$(PROJECT_INCLUDE)/bsp/vectors.h: new-exceptions/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h - -$(PROJECT_INCLUDE)/mpc83xx/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc83xx - @: > $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) - -$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h - -if !mpc5xx -endif -if shared -$(PROJECT_INCLUDE)/libcpu/io.h: shared/include/io.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/io.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/io.h - -$(PROJECT_INCLUDE)/libcpu/mmu.h: shared/include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h - -$(PROJECT_INCLUDE)/libcpu/page.h: shared/include/page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h - -$(PROJECT_INCLUDE)/libcpu/byteorder.h: shared/include/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h - -$(PROJECT_INCLUDE)/libcpu/pgtable.h: shared/include/pgtable.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pgtable.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pgtable.h - -$(PROJECT_INCLUDE)/libcpu/cpuIdent.h: shared/include/cpuIdent.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.h - -$(PROJECT_INCLUDE)/libcpu/spr.h: shared/include/spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spr.h - -$(PROJECT_INCLUDE)/libcpu/stackTrace.h: shared/src/stackTrace.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/stackTrace.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/stackTrace.h -endif -if ppc4xx -if ppc405 -$(PROJECT_INCLUDE)/tty_drv.h: ppc403/tty_drv/tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tty_drv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tty_drv.h -endif -endif # ppc4xx -if ppc405 -$(PROJECT_INCLUDE)/ppc4xx/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/ppc4xx - @: > $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp) - -$(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h: ppc403/include/ppc405gp.h $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h - -$(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h: ppc403/include/ppc405ex.h $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h -endif # ppc405 -if mpc5xx -$(PROJECT_INCLUDE)/mpc5xx/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc5xx - @: > $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp) - -$(PROJECT_INCLUDE)/mpc5xx.h: mpc5xx/include/mpc5xx.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc5xx.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc5xx.h - -$(PROJECT_INCLUDE)/mpc5xx/console.h: mpc5xx/include/console.h $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc5xx/console.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc5xx/console.h - -$(PROJECT_INCLUDE)/libcpu/raw_exception.h: mpc5xx/exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h - -$(PROJECT_INCLUDE)/libcpu/irq.h: mpc5xx/irq/irq.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/irq.h - -$(PROJECT_INCLUDE)/libcpu/vectors.h: mpc5xx/vectors/vectors.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/vectors.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/vectors.h -endif -if mpc505 -$(PROJECT_INCLUDE)/ictrl.h: mpc505/ictrl/ictrl.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h -endif -if mpc6xx -$(PROJECT_INCLUDE)/libcpu/bat.h: mpc6xx/mmu/bat.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bat.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bat.h - -$(PROJECT_INCLUDE)/libcpu/pte121.h: mpc6xx/mmu/pte121.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pte121.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pte121.h - -$(PROJECT_INCLUDE)/libcpu/c_clock.h: mpc6xx/clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h -endif -if e500_clock -$(PROJECT_INCLUDE)/libcpu/c_clock.h: mpc6xx/clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h -endif -if e500_mmu -$(PROJECT_INCLUDE)/libcpu/e500_mmu.h: e500/mmu/e500_mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/e500_mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/e500_mmu.h -endif -if mpc8xx -$(PROJECT_INCLUDE)/mpc8xx/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc8xx - @: > $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp) - -$(PROJECT_INCLUDE)/mpc8xx.h: mpc8xx/include/mpc8xx.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx.h - -$(PROJECT_INCLUDE)/mpc8xx/console.h: mpc8xx/include/console.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/console.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/console.h - -$(PROJECT_INCLUDE)/mpc8xx/cpm.h: mpc8xx/include/cpm.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/cpm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/cpm.h - -$(PROJECT_INCLUDE)/mpc8xx/mmu.h: mpc8xx/include/mmu.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/mmu.h -endif -if mpc8260 -$(PROJECT_INCLUDE)/mpc8260/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc8260 - @: > $(PROJECT_INCLUDE)/mpc8260/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc8260/$(dirstamp) - -$(PROJECT_INCLUDE)/mpc8260.h: mpc8260/include/mpc8260.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260.h - -$(PROJECT_INCLUDE)/mpc8260/console.h: mpc8260/include/console.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/console.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/console.h - -$(PROJECT_INCLUDE)/mpc8260/cpm.h: mpc8260/include/cpm.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/cpm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/cpm.h - -$(PROJECT_INCLUDE)/mpc8260/mmu.h: mpc8260/include/mmu.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/mmu.h -endif -if mpc83xx -$(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h: mpc83xx/include/mpc83xx.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h - -$(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h - -$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h: mpc83xx/spi/mpc83xx_spidrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h - -$(PROJECT_INCLUDE)/mpc83xx/gtm.h: mpc83xx/include/gtm.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/gtm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/gtm.h -endif -if mpc55xx -$(PROJECT_INCLUDE)/mpc55xx/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc55xx - @: > $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - -$(PROJECT_INCLUDE)/mpc55xx/regs.h: mpc55xx/include/regs.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs.h - -$(PROJECT_INCLUDE)/mpc55xx/reg-defs.h: mpc55xx/include/reg-defs.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/reg-defs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/reg-defs.h - -$(PROJECT_INCLUDE)/mpc55xx/dspi.h: mpc55xx/include/dspi.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/dspi.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/dspi.h - -$(PROJECT_INCLUDE)/mpc55xx/edma.h: mpc55xx/include/edma.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/edma.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/edma.h - -$(PROJECT_INCLUDE)/mpc55xx/emios.h: mpc55xx/include/emios.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/emios.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/emios.h - -$(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h: mpc55xx/include/mpc55xx.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h - -$(PROJECT_INCLUDE)/mpc55xx/siu.h: mpc55xx/include/siu.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/siu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/siu.h - -$(PROJECT_INCLUDE)/mpc55xx/watchdog.h: mpc55xx/include/watchdog.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/watchdog.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/watchdog.h - -$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h: mpc55xx/include/fsl-mpc551x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h - -$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h: mpc55xx/include/fsl-mpc555x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h - -$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h: mpc55xx/include/fsl-mpc556x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h - -$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h: mpc55xx/include/fsl-mpc564xL.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h - -$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h: mpc55xx/include/fsl-mpc5668.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h - -$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h: mpc55xx/include/fsl-mpc567x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h - -$(PROJECT_INCLUDE)/mpc55xx/regs-edma.h: mpc55xx/include/regs-edma.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs-edma.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs-edma.h - -$(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h: mpc55xx/include/regs-mmu.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h -endif -if qoriq -$(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h - -endif diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am index 67a35ee4b8..4d957dac04 100644 --- a/c/src/lib/libcpu/sparc/Makefile.am +++ b/c/src/lib/libcpu/sparc/Makefile.am @@ -4,10 +4,6 @@ include $(top_srcdir)/../../../automake/compile.am noinst_PROGRAMS = -include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = -include_libcpu_HEADERS += include/libcpu/access.h - noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache/cache_.h \ ../shared/src/cache_manager.c @@ -33,5 +29,4 @@ access_rel_SOURCES = access/access.S access/access_le.c access_rel_CPPFLAGS = $(AM_CPPFLAGS) access_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/sparc/configure.ac b/c/src/lib/libcpu/sparc/configure.ac index 40085add95..98b2ce8c4b 100644 --- a/c/src/lib/libcpu/sparc/configure.ac +++ b/c/src/lib/libcpu/sparc/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-sparc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([reg_win]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/sparc/preinstall.am b/c/src/lib/libcpu/sparc/preinstall.am deleted file mode 100644 index ec35254581..0000000000 --- a/c/src/lib/libcpu/sparc/preinstall.am +++ /dev/null @@ -1,24 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES = $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/access.h: include/libcpu/access.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/access.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/access.h - diff --git a/c/src/lib/libcpu/sparc64/Makefile.am b/c/src/lib/libcpu/sparc64/Makefile.am index f7b3beb350..81d07d4617 100644 --- a/c/src/lib/libcpu/sparc64/Makefile.am +++ b/c/src/lib/libcpu/sparc64/Makefile.am @@ -56,5 +56,4 @@ endif #endif ### End of example. -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/sparc64/configure.ac b/c/src/lib/libcpu/sparc64/configure.ac index 5604c4215c..08607a53e7 100644 --- a/c/src/lib/libcpu/sparc64/configure.ac +++ b/c/src/lib/libcpu/sparc64/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libcpu-sparc64],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shared]) RTEMS_TOP([../../../../..],[../../..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libcpu/sparc64/preinstall.am b/c/src/lib/libcpu/sparc64/preinstall.am deleted file mode 100644 index dba6cc4d81..0000000000 --- a/c/src/lib/libcpu/sparc64/preinstall.am +++ /dev/null @@ -1,7 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - |