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/libbsp/m68k/mcf5206elite | |
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/m68k/mcf5206elite/include/bsp.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/ds1307.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/i2c.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/i2cdrv.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/nvram.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h) | 0 | ||||
-rw-r--r-- | bsps/m68k/mcf5206elite/include/tm27.h (renamed from c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 21 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am | 87 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac | 2 |
11 files changed, 11 insertions, 102 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/bsps/m68k/mcf5206elite/include/bsp.h index 47c7e8c745..47c7e8c745 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/bsps/m68k/mcf5206elite/include/bsp.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h b/bsps/m68k/mcf5206elite/include/ds1307.h index 8e5636a0c8..8e5636a0c8 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h +++ b/bsps/m68k/mcf5206elite/include/ds1307.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h b/bsps/m68k/mcf5206elite/include/i2c.h index 8bec067a3a..8bec067a3a 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h +++ b/bsps/m68k/mcf5206elite/include/i2c.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h b/bsps/m68k/mcf5206elite/include/i2cdrv.h index 4b4a1ec141..4b4a1ec141 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h +++ b/bsps/m68k/mcf5206elite/include/i2cdrv.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h b/bsps/m68k/mcf5206elite/include/nvram.h index fd75db2363..fd75db2363 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h +++ b/bsps/m68k/mcf5206elite/include/nvram.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h b/bsps/m68k/mcf5206elite/include/tm27.h index 2abef68311..2abef68311 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h +++ b/bsps/m68k/mcf5206elite/include/tm27.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 90937076c6..7e0c38902b 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -4,23 +4,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp +dist_project_lib_DATA = startup/bsp_specs -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h _SUBDIRS = . tools -include_HEADERS += include/i2c.h -include_HEADERS += include/i2cdrv.h -include_HEADERS += include/ds1307.h -include_HEADERS += include/nvram.h EXTRA_DIST += times @@ -29,8 +18,10 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/gdbinit \ - startup/linkcmds.flash +project_lib_DATA += linkcmds +dist_project_lib_DATA += startup/linkcmds.flash + +dist_project_lib_DATA += startup/gdbinit noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -64,5 +55,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/mcf5206/timer.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/m68k/mcf5206elite/headers.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac index 5c46002976..ccb3625138 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/mcf5206elite.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am b/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am deleted file mode 100644 index c08f87dd0a..0000000000 --- a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am +++ /dev/null @@ -1,87 +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) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(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_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_INCLUDE)/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2c.h - -$(PROJECT_INCLUDE)/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cdrv.h - -$(PROJECT_INCLUDE)/ds1307.h: include/ds1307.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ds1307.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ds1307.h - -$(PROJECT_INCLUDE)/nvram.h: include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/gdbinit: startup/gdbinit $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/gdbinit -PREINSTALL_FILES += $(PROJECT_LIB)/gdbinit - -$(PROJECT_LIB)/linkcmds.flash: startup/linkcmds.flash $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.flash -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.flash - diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs +++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac index 39e9682157..c2654a5ca9 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([runtest]) RTEMS_TOP(../../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) AM_MAINTAINER_MODE |