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/score/cpu/m68k | |
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/score/cpu/m68k/Makefile.am | 18 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/headers.am | 24 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/machine/elf_machdep.h (renamed from cpukit/libdl/include/arch/m68k/machine/elf_machdep.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/asm.h (renamed from cpukit/score/cpu/m68k/rtems/asm.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/m68k/m68302.h (renamed from cpukit/score/cpu/m68k/rtems/m68k/m68302.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h (renamed from cpukit/score/cpu/m68k/rtems/m68k/m68360.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/m68k/qsm.h (renamed from cpukit/score/cpu/m68k/rtems/m68k/qsm.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/m68k/sim.h (renamed from cpukit/score/cpu/m68k/rtems/m68k/sim.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/score/cpu.h (renamed from cpukit/score/cpu/m68k/rtems/score/cpu.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/score/cpuatomic.h (renamed from cpukit/score/cpu/m68k/rtems/score/cpuatomic.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/score/cpuimpl.h (renamed from cpukit/score/cpu/m68k/rtems/score/cpuimpl.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/score/m68k.h (renamed from cpukit/score/cpu/m68k/rtems/score/m68k.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/score/types.h (renamed from cpukit/score/cpu/m68k/rtems/score/types.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/m68k/preinstall.am | 70 |
14 files changed, 25 insertions, 87 deletions
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am index 04eebcba85..68fd3a253a 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -3,26 +3,10 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libscorecpu.a libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/asm.h - -include_rtems_m68kdir = $(includedir)/rtems/m68k -include_rtems_m68k_HEADERS = rtems/m68k/m68302.h -include_rtems_m68k_HEADERS += rtems/m68k/m68360.h -include_rtems_m68k_HEADERS += rtems/m68k/qsm.h -include_rtems_m68k_HEADERS += rtems/m68k/sim.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/m68k.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += m68k-exception-frame-print.c libscorecpu_a_SOURCES += __m68k_read_tp.c -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am +include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/m68k/headers.am b/cpukit/score/cpu/m68k/headers.am new file mode 100644 index 0000000000..e02fad3906 --- /dev/null +++ b/cpukit/score/cpu/m68k/headers.am @@ -0,0 +1,24 @@ +## This file was generated by "./boostrap -H". + +include_machinedir = $(includedir)/machine +include_machine_HEADERS = +include_machine_HEADERS += include/machine/elf_machdep.h + +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = +include_rtems_HEADERS += include/rtems/asm.h + +include_rtems_m68kdir = $(includedir)/rtems/m68k +include_rtems_m68k_HEADERS = +include_rtems_m68k_HEADERS += include/rtems/m68k/m68302.h +include_rtems_m68k_HEADERS += include/rtems/m68k/m68360.h +include_rtems_m68k_HEADERS += include/rtems/m68k/qsm.h +include_rtems_m68k_HEADERS += include/rtems/m68k/sim.h + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = +include_rtems_score_HEADERS += include/rtems/score/cpu.h +include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += include/rtems/score/m68k.h +include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/libdl/include/arch/m68k/machine/elf_machdep.h b/cpukit/score/cpu/m68k/include/machine/elf_machdep.h index 9a987c69b5..9a987c69b5 100644 --- a/cpukit/libdl/include/arch/m68k/machine/elf_machdep.h +++ b/cpukit/score/cpu/m68k/include/machine/elf_machdep.h diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/include/rtems/asm.h index cbd2a7f8b2..cbd2a7f8b2 100644 --- a/cpukit/score/cpu/m68k/rtems/asm.h +++ b/cpukit/score/cpu/m68k/include/rtems/asm.h diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h b/cpukit/score/cpu/m68k/include/rtems/m68k/m68302.h index acf55f50c5..acf55f50c5 100644 --- a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h +++ b/cpukit/score/cpu/m68k/include/rtems/m68k/m68302.h diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h b/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h index dc181d0cdf..dc181d0cdf 100644 --- a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h +++ b/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h diff --git a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h b/cpukit/score/cpu/m68k/include/rtems/m68k/qsm.h index 32dbc1d5f9..32dbc1d5f9 100644 --- a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h +++ b/cpukit/score/cpu/m68k/include/rtems/m68k/qsm.h diff --git a/cpukit/score/cpu/m68k/rtems/m68k/sim.h b/cpukit/score/cpu/m68k/include/rtems/m68k/sim.h index cec6b84cc1..cec6b84cc1 100644 --- a/cpukit/score/cpu/m68k/rtems/m68k/sim.h +++ b/cpukit/score/cpu/m68k/include/rtems/m68k/sim.h diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h index 2be10c9638..2be10c9638 100644 --- a/cpukit/score/cpu/m68k/rtems/score/cpu.h +++ b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h diff --git a/cpukit/score/cpu/m68k/rtems/score/cpuatomic.h b/cpukit/score/cpu/m68k/include/rtems/score/cpuatomic.h index 598ee76b20..598ee76b20 100644 --- a/cpukit/score/cpu/m68k/rtems/score/cpuatomic.h +++ b/cpukit/score/cpu/m68k/include/rtems/score/cpuatomic.h diff --git a/cpukit/score/cpu/m68k/rtems/score/cpuimpl.h b/cpukit/score/cpu/m68k/include/rtems/score/cpuimpl.h index 789f2badd9..789f2badd9 100644 --- a/cpukit/score/cpu/m68k/rtems/score/cpuimpl.h +++ b/cpukit/score/cpu/m68k/include/rtems/score/cpuimpl.h diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/include/rtems/score/m68k.h index 818578c078..818578c078 100644 --- a/cpukit/score/cpu/m68k/rtems/score/m68k.h +++ b/cpukit/score/cpu/m68k/include/rtems/score/m68k.h diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/cpukit/score/cpu/m68k/include/rtems/score/types.h index 947c6ace69..947c6ace69 100644 --- a/cpukit/score/cpu/m68k/rtems/score/types.h +++ b/cpukit/score/cpu/m68k/include/rtems/score/types.h diff --git a/cpukit/score/cpu/m68k/preinstall.am b/cpukit/score/cpu/m68k/preinstall.am deleted file mode 100644 index a580b7a4b5..0000000000 --- a/cpukit/score/cpu/m68k/preinstall.am +++ /dev/null @@ -1,70 +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)/rtems/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems - @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h - -$(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/m68k - @: > $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/m68k/m68302.h: rtems/m68k/m68302.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/m68302.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/m68302.h - -$(PROJECT_INCLUDE)/rtems/m68k/m68360.h: rtems/m68k/m68360.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/m68360.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/m68360.h - -$(PROJECT_INCLUDE)/rtems/m68k/qsm.h: rtems/m68k/qsm.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/qsm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/qsm.h - -$(PROJECT_INCLUDE)/rtems/m68k/sim.h: rtems/m68k/sim.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/sim.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/sim.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h - -$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h - -$(PROJECT_INCLUDE)/rtems/score/m68k.h: rtems/score/m68k.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/m68k.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/m68k.h - -$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h - -$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h - |