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/libfs/src | |
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/include/librtemsNfs.h (renamed from cpukit/libfs/src/nfsclient/src/librtemsNfs.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/devfs.h (renamed from cpukit/libfs/src/devfs/devfs.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/dosfs.h (renamed from cpukit/libfs/src/dosfs/dosfs.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/imfs.h (renamed from cpukit/libfs/src/imfs/imfs.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/jffs2.h (renamed from cpukit/libfs/src/jffs2/include/rtems/jffs2.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/pipe.h (renamed from cpukit/libfs/src/pipe/pipe.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-block-pos.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-block-pos.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-block.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-block.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-buffer.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-buffer.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-data.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-data.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-dir.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-dir.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-file-system.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-file-system.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-file.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-file.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-group.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-group.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-inode.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-inode.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-link.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-link.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-mutex.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-mutex.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rfs/rtems-rfs-trace.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-trace.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rtems-rfs-format.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-format.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rtems-rfs-shell.h (renamed from cpukit/libfs/src/rfs/rtems-rfs-shell.h) | 0 | ||||
-rw-r--r-- | cpukit/include/rtems/rtems-rfs.h (renamed from cpukit/libfs/src/rfs/rtems-rfs.h) | 0 | ||||
-rw-r--r-- | cpukit/libfs/src/nfsclient/Makefile.am | 8 | ||||
-rw-r--r-- | cpukit/libfs/src/nfsclient/preinstall.am | 51 |
26 files changed, 5 insertions, 54 deletions
diff --git a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h b/cpukit/include/librtemsNfs.h index 530eee2144..530eee2144 100644 --- a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h +++ b/cpukit/include/librtemsNfs.h diff --git a/cpukit/libfs/src/devfs/devfs.h b/cpukit/include/rtems/devfs.h index b0a9197eca..b0a9197eca 100644 --- a/cpukit/libfs/src/devfs/devfs.h +++ b/cpukit/include/rtems/devfs.h diff --git a/cpukit/libfs/src/dosfs/dosfs.h b/cpukit/include/rtems/dosfs.h index 7691ed7e43..7691ed7e43 100644 --- a/cpukit/libfs/src/dosfs/dosfs.h +++ b/cpukit/include/rtems/dosfs.h diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/include/rtems/imfs.h index fe3c5b12a9..fe3c5b12a9 100644 --- a/cpukit/libfs/src/imfs/imfs.h +++ b/cpukit/include/rtems/imfs.h diff --git a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h b/cpukit/include/rtems/jffs2.h index a856c46c41..a856c46c41 100644 --- a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h +++ b/cpukit/include/rtems/jffs2.h diff --git a/cpukit/libfs/src/pipe/pipe.h b/cpukit/include/rtems/pipe.h index 7c6566ad50..7c6566ad50 100644 --- a/cpukit/libfs/src/pipe/pipe.h +++ b/cpukit/include/rtems/pipe.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h b/cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h index 5574339421..5574339421 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h b/cpukit/include/rtems/rfs/rtems-rfs-block-pos.h index 7d0f0693be..7d0f0693be 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-block-pos.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.h b/cpukit/include/rtems/rfs/rtems-rfs-block.h index 394853b7ad..394853b7ad 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-block.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-block.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h b/cpukit/include/rtems/rfs/rtems-rfs-buffer.h index 1c603e1827..1c603e1827 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-buffer.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-data.h b/cpukit/include/rtems/rfs/rtems-rfs-data.h index 6217e74587..6217e74587 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-data.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-data.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h b/cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h index d9a8a2004f..d9a8a2004f 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir.h b/cpukit/include/rtems/rfs/rtems-rfs-dir.h index ae3647d03c..ae3647d03c 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-dir.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-dir.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h b/cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h index e239c25d6f..e239c25d6f 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h b/cpukit/include/rtems/rfs/rtems-rfs-file-system.h index e00b142532..e00b142532 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-file-system.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file.h b/cpukit/include/rtems/rfs/rtems-rfs-file.h index 772e846143..772e846143 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-file.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-file.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-group.h b/cpukit/include/rtems/rfs/rtems-rfs-group.h index 23e6434b2c..23e6434b2c 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-group.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-group.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-inode.h b/cpukit/include/rtems/rfs/rtems-rfs-inode.h index 95861ea8a7..95861ea8a7 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-inode.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-inode.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-link.h b/cpukit/include/rtems/rfs/rtems-rfs-link.h index d30814aaff..d30814aaff 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-link.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-link.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h b/cpukit/include/rtems/rfs/rtems-rfs-mutex.h index 606fd53233..606fd53233 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-mutex.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-trace.h b/cpukit/include/rtems/rfs/rtems-rfs-trace.h index 4d6d0c9ddb..4d6d0c9ddb 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-trace.h +++ b/cpukit/include/rtems/rfs/rtems-rfs-trace.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-format.h b/cpukit/include/rtems/rtems-rfs-format.h index f65cce1789..f65cce1789 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-format.h +++ b/cpukit/include/rtems/rtems-rfs-format.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs-shell.h b/cpukit/include/rtems/rtems-rfs-shell.h index c2e1108a47..c2e1108a47 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-shell.h +++ b/cpukit/include/rtems/rtems-rfs-shell.h diff --git a/cpukit/libfs/src/rfs/rtems-rfs.h b/cpukit/include/rtems/rtems-rfs.h index 958f9a636b..958f9a636b 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs.h +++ b/cpukit/include/rtems/rtems-rfs.h diff --git a/cpukit/libfs/src/nfsclient/Makefile.am b/cpukit/libfs/src/nfsclient/Makefile.am index 85f4a71756..04d840f507 100644 --- a/cpukit/libfs/src/nfsclient/Makefile.am +++ b/cpukit/libfs/src/nfsclient/Makefile.am @@ -10,6 +10,11 @@ dirutils_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if LIBNETWORKING project_lib_LIBRARIES = libnfs.a +$(PROJECT_LIB)/libnfs.a: libnfs.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a +TMPINSTALL_FILES = $(PROJECT_LIB)/libnfs.a + + # if you have CEXP set this variable to 'YES' # and some "help" info will be compiled in. libnfs_a_SOURCES = src/rpcio.c src/rpcio.h @@ -19,8 +24,6 @@ libnfs_a_SOURCES += proto/mount_prot.h proto/nfs_prot.h # With CEXP # libnfs_a_SOURCES += dirutils.c rpcio.modini.c nfs.modini.c cexphelp.c -include_HEADERS = src/librtemsNfs.h - # PGMS=${ARCH}/nfs.obj ${ARCH}/rpcio.obj ${ARCH}/dirutils.obj libnfs_a_CPPFLAGS = $(AM_CPPFLAGS) @@ -66,5 +69,4 @@ $(srcdir)/proto/nfs_prot_xdr.c: proto/nfs_prot.x proto/nfs_prot.h > nfs_prot_xdr.c) endif -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/src/nfsclient/preinstall.am b/cpukit/libfs/src/nfsclient/preinstall.am deleted file mode 100644 index 593fc0367d..0000000000 --- a/cpukit/libfs/src/nfsclient/preinstall.am +++ /dev/null @@ -1,51 +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_LIB)/dirutils.rel: dirutils.rel $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/dirutils.rel -TMPINSTALL_FILES += $(PROJECT_LIB)/dirutils.rel - -if LIBNETWORKING -$(PROJECT_LIB)/libnfs.a: libnfs.a $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a -TMPINSTALL_FILES += $(PROJECT_LIB)/libnfs.a - -$(PROJECT_INCLUDE)/librtemsNfs.h: src/librtemsNfs.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/librtemsNfs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/librtemsNfs.h - -$(PROJECT_LIB)/nfs.rel: nfs.rel $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/nfs.rel -TMPINSTALL_FILES += $(PROJECT_LIB)/nfs.rel - -$(PROJECT_LIB)/rpcio.rel: rpcio.rel $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/rpcio.rel -TMPINSTALL_FILES += $(PROJECT_LIB)/rpcio.rel -endif |