summaryrefslogtreecommitdiffstats
path: root/c/src/automake
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-12-23 18:18:56 +1100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-25 08:45:26 +0100
commit2afb22b7e1ebcbe40373ff7e0efae7d207c655a9 (patch)
tree44759efe9374f13200a97e96d91bd9a2b7e5ce2a /c/src/automake
parentMAINTAINERS: Add myself to Write After Approval. (diff)
downloadrtems-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 'c/src/automake')
-rw-r--r--c/src/automake/compile.am12
-rw-r--r--c/src/automake/host.am3
-rw-r--r--c/src/automake/local.am6
-rw-r--r--c/src/automake/subdirs.am24
4 files changed, 10 insertions, 35 deletions
diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am
index a42e4f3949..2cd9fd5d91 100644
--- a/c/src/automake/compile.am
+++ b/c/src/automake/compile.am
@@ -1,12 +1,14 @@
## -------------------------------------------------------------------------
-CC = @CC@ $(GCCSPECS)
-CXX = @CXX@ $(GCCSPECS)
-CPP = @CPP@ $(GCCSPECS)
-CCAS = @CCAS@ $(GCCSPECS)
+CC = @CC@
+CXX = @CXX@
+CPP = @CPP@
+CCAS = @CCAS@
##
-AM_CPPFLAGS = @RTEMS_CPPFLAGS@
+AM_CPPFLAGS = @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@
AM_CFLAGS =
AM_CXXFLAGS =
AM_CCASFLAGS = @RTEMS_CCASFLAGS@
+
+ARFLAGS = crD
diff --git a/c/src/automake/host.am b/c/src/automake/host.am
index c25c0526a4..2f0beadd89 100644
--- a/c/src/automake/host.am
+++ b/c/src/automake/host.am
@@ -3,6 +3,3 @@
## Once automake is fully integrated these make targets
## and this file will probably be removed
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
diff --git a/c/src/automake/local.am b/c/src/automake/local.am
index 4de51e5197..8068b4c61c 100644
--- a/c/src/automake/local.am
+++ b/c/src/automake/local.am
@@ -1,5 +1,3 @@
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
-
PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
+
+all-local: $(TMPINSTALL_FILES)
diff --git a/c/src/automake/subdirs.am b/c/src/automake/subdirs.am
index 2f39d858ce..6ae7ff05a1 100644
--- a/c/src/automake/subdirs.am
+++ b/c/src/automake/subdirs.am
@@ -17,29 +17,7 @@ SUBDIRS_no_dot_no_wrapup_no_testsuites = $(filter-out testsuites,$(SUBDIRS_no_do
SUBDIRS_wrapup = $(filter wrapup,$(SUBDIRS_no_dot))
SUBDIRS_testsuites = $(filter testsuites,$(SUBDIRS_no_dot))
-SUBDIR_TARGET = $(subst /,-,$1)
-PREINSTALL_TARGET = preinstall-$(call SUBDIR_TARGET,$(1))
-
-preintstall_targets = $(if "$(SUBDIRS_dot)" ".",preinstall-dot) $(foreach D,$(SUBDIRS_no_dot),$(call PREINSTALL_TARGET,$(D)))
-
-define PREINSTALL_DIR
-.PHONY: $1
-$1:
- @+set fnord $(MAKEFLAGS); amf=$$$$2; \
- subdir=$(2); \
- subdir_label=`echo $(1) | sed -e 's/preinstall-//'`; \
- target=`echo $$@ | sed -e 's/-recursive//' -e "s/-$$$${subdir_label}//"`$(3); \
- echo "Making $$$$target in $$$$subdir"; \
- (cd $$$$subdir && $(MAKE) $(AM_MAKEFLAGS) $$$$target) \
- || case "$$$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac;
-endef
-
-$(if "$(SUBDIRS_dot)" ".",$(eval $(call PREINSTALL_DIR,preinstall-dot,.,-am)))
-
-$(foreach D,$(SUBDIRS_no_dot),$(eval $(call PREINSTALL_DIR,$(call PREINSTALL_TARGET,$(D)),$(D))))
-
preinstall: $(preintstall_targets)
-.PHONY: preinstall
define CPUKITDIR
.PHONY: $1
@@ -84,4 +62,4 @@ $(if "$(SUBDIRS_testsuites)" "testsuites",testsuites: dot $(SUBDIRS_no_dot_no_te
#
# The general build all rule for automake.
#
-all-local: preinstall $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
+all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)