summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-01-30 21:49:51 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-01-30 21:49:51 +0000
commit5c3511e5cff1019e683239fd71f6ea3254e1eccb (patch)
tree6b63bc3b948de974251de8e23f06946f13323363 /tools
parent421dfef68ecd8f424f987d75df3c3080108c5925 (diff)
downloadrtems-5c3511e5cff1019e683239fd71f6ea3254e1eccb.tar.bz2
Big patch form Ralf Corsepius described in this email:
Here is the result of my nightly work to get RTEMS_ROOT=$srcdir working with different shells and relative/absolute paths. What I did is relatively simple in principle: Instead of setting RTEMS_ROOT in configure.in and then let configure substitute @RTEMS_ROOT@ inside the Makefiles, I now let each Makefile set RTEMS_ROOT from each Makefile's @top_srcdir@ value. The difference is subtile, but with enormous side effects: - If RTEMS_ROOT is set in configure, then the same single value will be propagated to all Makefiles. This breaks using relative paths, as the relative path to the root of the source tree is used inside of all subdirectory Makefiles. - Now each Makefile.in sets RTEMS_ROOT = @top_srcdir@. top_srcdir is computed individually by configure for each single Makefile.in, hereby receiving the correct value, no matter if relative or absolute paths are used. To get this working, I needed to remove setting RTEMS_ROOT from target.cfg.in, because this overrides the value of RTEMS_ROOT from each individual Makefile. Furthermore, I removed RTEMS_CUSTOM from the Makefiles and replaced all "include $(RTEMS_CUSTOM)" directives with"include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP)". Perhaps you don't like this, but I think, to have one variable less is clearer and easier to understand than having several variables refering to the next one. I enclose a small patch to this mail, which - fixes the config.h problem (to finally clearify misunderstands) - removes assignment/subsitution of RTEMS_ROOT from configure.in - contains a workaround for the application Makefile's RTEMS_ROOT problem (reported by Eric) - removes some unused lines from the toplevel Makefile.in - removes assignment of RTEMS_ROOT from make/target.cfg.in
Diffstat (limited to 'tools')
-rw-r--r--tools/build/Makefile.in6
-rw-r--r--tools/build/os/Makefile.in6
-rw-r--r--tools/build/os/msdos/Makefile.in6
-rw-r--r--tools/build/scripts/Makefile.in6
-rw-r--r--tools/build/src/Makefile.in6
-rw-r--r--tools/cpu/Makefile.in6
-rw-r--r--tools/cpu/generic/Makefile.in6
-rw-r--r--tools/cpu/unix/Makefile.in6
-rw-r--r--tools/update/Makefile.in6
9 files changed, 18 insertions, 36 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 532bd01b67..ad819e8214 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -4,13 +4,11 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/directory.cfg
SUB_DIRS=os scripts src
diff --git a/tools/build/os/Makefile.in b/tools/build/os/Makefile.in
index 84fd6418ce..d540e58fa0 100644
--- a/tools/build/os/Makefile.in
+++ b/tools/build/os/Makefile.in
@@ -4,13 +4,11 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/directory.cfg
SUB_DIRS=$(wildcard $(RTEMS_HOST))
diff --git a/tools/build/os/msdos/Makefile.in b/tools/build/os/msdos/Makefile.in
index c11aacc1b3..4a060f7c37 100644
--- a/tools/build/os/msdos/Makefile.in
+++ b/tools/build/os/msdos/Makefile.in
@@ -4,13 +4,11 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
DESTDIR=$(PROJECT_RELEASE)/build-tools
diff --git a/tools/build/scripts/Makefile.in b/tools/build/scripts/Makefile.in
index 42ee76837d..db02f4736c 100644
--- a/tools/build/scripts/Makefile.in
+++ b/tools/build/scripts/Makefile.in
@@ -8,13 +8,11 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
DESTDIR=$(PROJECT_RELEASE)/build-tools
diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in
index a24e9c264a..e94656cd6c 100644
--- a/tools/build/src/Makefile.in
+++ b/tools/build/src/Makefile.in
@@ -4,7 +4,6 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
@@ -13,9 +12,8 @@ manext = 1
mandir = @mandir@/man$(manext)
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
# we use host compiler in this directory
USE_HOST_COMPILER=yes
@@ -32,7 +30,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
PGMS=$(ARCH)/cklength $(ARCH)/eolstrip $(ARCH)/packhex $(ARCH)/unhex
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in
index c45dd64a77..6dba1f38f6 100644
--- a/tools/cpu/Makefile.in
+++ b/tools/cpu/Makefile.in
@@ -4,13 +4,11 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/directory.cfg
SUB_DIRS=generic $(wildcard $(RTEMS_CPU))
diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in
index 5aeeaf871f..419b20b96c 100644
--- a/tools/cpu/generic/Makefile.in
+++ b/tools/cpu/generic/Makefile.in
@@ -8,13 +8,11 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
DESTDIR=$(PROJECT_RELEASE)/bin
diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in
index 9176b7f5b1..6041f15730 100644
--- a/tools/cpu/unix/Makefile.in
+++ b/tools/cpu/unix/Makefile.in
@@ -4,11 +4,9 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
# we use host compiler here for gensize. Hopefully it has same alignment!!
USE_HOST_COMPILER=yes
@@ -25,7 +23,7 @@ OBJS=$(C_O_FILES)
PGMS=${ARCH}/gensize
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
# We use files that have not been installed yet.
diff --git a/tools/update/Makefile.in b/tools/update/Makefile.in
index e4ba479e1b..025930cdd2 100644
--- a/tools/update/Makefile.in
+++ b/tools/update/Makefile.in
@@ -7,13 +7,11 @@
@SET_MAKE@
srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
DESTDIR=$(PROJECT_RELEASE)/update-tools