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 /cpukit/dev | |
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-- | cpukit/dev/Makefile.am | 34 | ||||
-rw-r--r-- | cpukit/dev/preinstall.am | 105 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/eeprom.h (renamed from cpukit/dev/include/dev/i2c/eeprom.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/fpga-i2c-slave.h (renamed from cpukit/dev/include/dev/i2c/fpga-i2c-slave.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/gpio-nxp-pca9535.h (renamed from cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/i2c.h (renamed from cpukit/dev/include/dev/i2c/i2c.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/sensor-lm75a.h (renamed from cpukit/dev/include/dev/i2c/sensor-lm75a.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/switch-nxp-pca9548a.h (renamed from cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/ti-ads-16bit-adc.h (renamed from cpukit/dev/include/dev/i2c/ti-ads-16bit-adc.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/ti-lm25066a.h (renamed from cpukit/dev/include/dev/i2c/ti-lm25066a.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/ti-tmp112.h (renamed from cpukit/dev/include/dev/i2c/ti-tmp112.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/i2c/xilinx-axi-i2c.h (renamed from cpukit/dev/include/dev/i2c/xilinx-axi-i2c.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/serial/sc16is752.h (renamed from cpukit/dev/include/dev/serial/sc16is752.h) | 0 | ||||
-rw-r--r-- | cpukit/include/dev/spi/spi.h (renamed from cpukit/dev/include/dev/spi/spi.h) | 0 | ||||
-rw-r--r-- | cpukit/include/linux/i2c-dev.h (renamed from cpukit/dev/include/linux/i2c-dev.h) | 0 | ||||
-rw-r--r-- | cpukit/include/linux/i2c.h (renamed from cpukit/dev/include/linux/i2c.h) | 0 | ||||
-rw-r--r-- | cpukit/include/linux/spi/spidev.h (renamed from cpukit/dev/include/linux/spi/spidev.h) | 0 |
17 files changed, 0 insertions, 139 deletions
diff --git a/cpukit/dev/Makefile.am b/cpukit/dev/Makefile.am index b60e035fdb..f499bbb948 100644 --- a/cpukit/dev/Makefile.am +++ b/cpukit/dev/Makefile.am @@ -1,39 +1,6 @@ include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/multilib.am -include_devdir = $(includedir)/dev -include_dev_HEADERS = - -include_dev_i2cdir = $(includedir)/dev/i2c -include_dev_i2c_HEADERS = -include_dev_i2c_HEADERS += include/dev/i2c/eeprom.h -include_dev_i2c_HEADERS += include/dev/i2c/fpga-i2c-slave.h -include_dev_i2c_HEADERS += include/dev/i2c/gpio-nxp-pca9535.h -include_dev_i2c_HEADERS += include/dev/i2c/i2c.h -include_dev_i2c_HEADERS += include/dev/i2c/sensor-lm75a.h -include_dev_i2c_HEADERS += include/dev/i2c/switch-nxp-pca9548a.h -include_dev_i2c_HEADERS += include/dev/i2c/xilinx-axi-i2c.h -include_dev_i2c_HEADERS += include/dev/i2c/ti-ads-16bit-adc.h -include_dev_i2c_HEADERS += include/dev/i2c/ti-lm25066a.h -include_dev_i2c_HEADERS += include/dev/i2c/ti-tmp112.h - -include_dev_spidir = $(includedir)/dev/spi -include_dev_spi_HEADERS = -include_dev_spi_HEADERS += include/dev/spi/spi.h - -include_dev_serialdir = $(includedir)/dev/serial -include_dev_serial_HEADERS = -include_dev_serial_HEADERS += include/dev/serial/sc16is752.h - -include_linuxdir = $(includedir)/linux -include_linux_HEADERS = -include_linux_HEADERS += include/linux/i2c.h -include_linux_HEADERS += include/linux/i2c-dev.h - -include_linux_spidir = $(includedir)/linux/spi -include_linux_spi_HEADERS = -include_linux_spi_HEADERS += include/linux/spi/spidev.h - noinst_LIBRARIES = libdev.a libdev_a_SOURCES = @@ -53,5 +20,4 @@ libdev_a_SOURCES += serial/sc16is752.c libdev_a_SOURCES += serial/sc16is752-spi.c libdev_a_SOURCES += serial/sc16is752-regs.h -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/dev/preinstall.am b/cpukit/dev/preinstall.am deleted file mode 100644 index 4cb1dce127..0000000000 --- a/cpukit/dev/preinstall.am +++ /dev/null @@ -1,105 +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)/dev/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/dev - @: > $(PROJECT_INCLUDE)/dev/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/$(dirstamp) - -$(PROJECT_INCLUDE)/dev/i2c/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/dev/i2c - @: > $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - -$(PROJECT_INCLUDE)/dev/i2c/eeprom.h: include/dev/i2c/eeprom.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/eeprom.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/eeprom.h - -$(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h: include/dev/i2c/fpga-i2c-slave.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h - -$(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h: include/dev/i2c/gpio-nxp-pca9535.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h - -$(PROJECT_INCLUDE)/dev/i2c/i2c.h: include/dev/i2c/i2c.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/i2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/i2c.h - -$(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h: include/dev/i2c/sensor-lm75a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h - -$(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h: include/dev/i2c/switch-nxp-pca9548a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h - -$(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h: include/dev/i2c/xilinx-axi-i2c.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h - -$(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h: include/dev/i2c/ti-ads-16bit-adc.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h - -$(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h: include/dev/i2c/ti-lm25066a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h - -$(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h: include/dev/i2c/ti-tmp112.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h - -$(PROJECT_INCLUDE)/dev/spi/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/dev/spi - @: > $(PROJECT_INCLUDE)/dev/spi/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/spi/$(dirstamp) - -$(PROJECT_INCLUDE)/dev/spi/spi.h: include/dev/spi/spi.h $(PROJECT_INCLUDE)/dev/spi/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/spi/spi.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/spi/spi.h - -$(PROJECT_INCLUDE)/dev/serial/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/dev/serial - @: > $(PROJECT_INCLUDE)/dev/serial/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/serial/$(dirstamp) - -$(PROJECT_INCLUDE)/dev/serial/sc16is752.h: include/dev/serial/sc16is752.h $(PROJECT_INCLUDE)/dev/serial/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/serial/sc16is752.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/serial/sc16is752.h - -$(PROJECT_INCLUDE)/linux/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/linux - @: > $(PROJECT_INCLUDE)/linux/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/linux/$(dirstamp) - -$(PROJECT_INCLUDE)/linux/i2c.h: include/linux/i2c.h $(PROJECT_INCLUDE)/linux/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/i2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/i2c.h - -$(PROJECT_INCLUDE)/linux/i2c-dev.h: include/linux/i2c-dev.h $(PROJECT_INCLUDE)/linux/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/i2c-dev.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/i2c-dev.h - -$(PROJECT_INCLUDE)/linux/spi/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/linux/spi - @: > $(PROJECT_INCLUDE)/linux/spi/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/linux/spi/$(dirstamp) - -$(PROJECT_INCLUDE)/linux/spi/spidev.h: include/linux/spi/spidev.h $(PROJECT_INCLUDE)/linux/spi/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/spi/spidev.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/spi/spidev.h - diff --git a/cpukit/dev/include/dev/i2c/eeprom.h b/cpukit/include/dev/i2c/eeprom.h index 73df5ad9f4..73df5ad9f4 100644 --- a/cpukit/dev/include/dev/i2c/eeprom.h +++ b/cpukit/include/dev/i2c/eeprom.h diff --git a/cpukit/dev/include/dev/i2c/fpga-i2c-slave.h b/cpukit/include/dev/i2c/fpga-i2c-slave.h index c10b26ac5b..c10b26ac5b 100644 --- a/cpukit/dev/include/dev/i2c/fpga-i2c-slave.h +++ b/cpukit/include/dev/i2c/fpga-i2c-slave.h diff --git a/cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h b/cpukit/include/dev/i2c/gpio-nxp-pca9535.h index 1ebc1a3d4d..1ebc1a3d4d 100644 --- a/cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h +++ b/cpukit/include/dev/i2c/gpio-nxp-pca9535.h diff --git a/cpukit/dev/include/dev/i2c/i2c.h b/cpukit/include/dev/i2c/i2c.h index 2ace4fcf64..2ace4fcf64 100644 --- a/cpukit/dev/include/dev/i2c/i2c.h +++ b/cpukit/include/dev/i2c/i2c.h diff --git a/cpukit/dev/include/dev/i2c/sensor-lm75a.h b/cpukit/include/dev/i2c/sensor-lm75a.h index e1957dad19..e1957dad19 100644 --- a/cpukit/dev/include/dev/i2c/sensor-lm75a.h +++ b/cpukit/include/dev/i2c/sensor-lm75a.h diff --git a/cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h b/cpukit/include/dev/i2c/switch-nxp-pca9548a.h index ce8ef2c809..ce8ef2c809 100644 --- a/cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h +++ b/cpukit/include/dev/i2c/switch-nxp-pca9548a.h diff --git a/cpukit/dev/include/dev/i2c/ti-ads-16bit-adc.h b/cpukit/include/dev/i2c/ti-ads-16bit-adc.h index 40d680da88..40d680da88 100644 --- a/cpukit/dev/include/dev/i2c/ti-ads-16bit-adc.h +++ b/cpukit/include/dev/i2c/ti-ads-16bit-adc.h diff --git a/cpukit/dev/include/dev/i2c/ti-lm25066a.h b/cpukit/include/dev/i2c/ti-lm25066a.h index 4429f0fc70..4429f0fc70 100644 --- a/cpukit/dev/include/dev/i2c/ti-lm25066a.h +++ b/cpukit/include/dev/i2c/ti-lm25066a.h diff --git a/cpukit/dev/include/dev/i2c/ti-tmp112.h b/cpukit/include/dev/i2c/ti-tmp112.h index 1b80fa6994..1b80fa6994 100644 --- a/cpukit/dev/include/dev/i2c/ti-tmp112.h +++ b/cpukit/include/dev/i2c/ti-tmp112.h diff --git a/cpukit/dev/include/dev/i2c/xilinx-axi-i2c.h b/cpukit/include/dev/i2c/xilinx-axi-i2c.h index fafac346ec..fafac346ec 100644 --- a/cpukit/dev/include/dev/i2c/xilinx-axi-i2c.h +++ b/cpukit/include/dev/i2c/xilinx-axi-i2c.h diff --git a/cpukit/dev/include/dev/serial/sc16is752.h b/cpukit/include/dev/serial/sc16is752.h index 7e5b47aaa2..7e5b47aaa2 100644 --- a/cpukit/dev/include/dev/serial/sc16is752.h +++ b/cpukit/include/dev/serial/sc16is752.h diff --git a/cpukit/dev/include/dev/spi/spi.h b/cpukit/include/dev/spi/spi.h index 66bbac2427..66bbac2427 100644 --- a/cpukit/dev/include/dev/spi/spi.h +++ b/cpukit/include/dev/spi/spi.h diff --git a/cpukit/dev/include/linux/i2c-dev.h b/cpukit/include/linux/i2c-dev.h index c0db3fe06c..c0db3fe06c 100644 --- a/cpukit/dev/include/linux/i2c-dev.h +++ b/cpukit/include/linux/i2c-dev.h diff --git a/cpukit/dev/include/linux/i2c.h b/cpukit/include/linux/i2c.h index b113545cce..b113545cce 100644 --- a/cpukit/dev/include/linux/i2c.h +++ b/cpukit/include/linux/i2c.h diff --git a/cpukit/dev/include/linux/spi/spidev.h b/cpukit/include/linux/spi/spidev.h index e2fdb4b7e1..e2fdb4b7e1 100644 --- a/cpukit/dev/include/linux/spi/spidev.h +++ b/cpukit/include/linux/spi/spidev.h |