summaryrefslogtreecommitdiffstats
path: root/c/src/exec
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 /c/src/exec
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 'c/src/exec')
-rw-r--r--c/src/exec/Makefile.in6
-rw-r--r--c/src/exec/posix/Makefile.in6
-rw-r--r--c/src/exec/posix/base/Makefile.in6
-rw-r--r--c/src/exec/posix/headers/Makefile.in6
-rw-r--r--c/src/exec/posix/include/rtems/posix/Makefile.in6
-rw-r--r--c/src/exec/posix/include/sys/Makefile.in6
-rw-r--r--c/src/exec/posix/include/wrap/Makefile.in6
-rw-r--r--c/src/exec/posix/inline/Makefile.in6
-rw-r--r--c/src/exec/posix/inline/rtems/posix/Makefile.in6
-rw-r--r--c/src/exec/posix/macros/Makefile.in6
-rw-r--r--c/src/exec/posix/macros/rtems/posix/Makefile.in6
-rw-r--r--c/src/exec/posix/optman/Makefile.in6
-rw-r--r--c/src/exec/posix/src/Makefile.in6
-rw-r--r--c/src/exec/posix/sys/Makefile.in6
-rw-r--r--c/src/exec/rtems/Makefile.in6
-rw-r--r--c/src/exec/rtems/headers/Makefile.in6
-rw-r--r--c/src/exec/rtems/include/rtems/rtems/Makefile.in6
-rw-r--r--c/src/exec/rtems/inline/Makefile.in6
-rw-r--r--c/src/exec/rtems/inline/rtems/rtems/Makefile.in6
-rw-r--r--c/src/exec/rtems/macros/Makefile.in6
-rw-r--r--c/src/exec/rtems/macros/rtems/rtems/Makefile.in6
-rw-r--r--c/src/exec/rtems/optman/Makefile.in6
-rw-r--r--c/src/exec/rtems/src/Makefile.in6
-rw-r--r--c/src/exec/sapi/Makefile.in6
-rw-r--r--c/src/exec/sapi/headers/Makefile.in6
-rw-r--r--c/src/exec/sapi/include/rtems/Makefile.in6
-rw-r--r--c/src/exec/sapi/inline/Makefile.in6
-rw-r--r--c/src/exec/sapi/inline/rtems/Makefile.in6
-rw-r--r--c/src/exec/sapi/macros/Makefile.in6
-rw-r--r--c/src/exec/sapi/macros/rtems/Makefile.in6
-rw-r--r--c/src/exec/sapi/optman/Makefile.in6
-rw-r--r--c/src/exec/sapi/src/Makefile.in6
-rw-r--r--c/src/exec/score/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/a29k/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/hppa1.1/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/i386/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/i960/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/m68k/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/mips64orion/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/no_cpu/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/powerpc/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/sparc/Makefile.in6
-rw-r--r--c/src/exec/score/cpu/unix/Makefile.in6
-rw-r--r--c/src/exec/score/headers/Makefile.in6
-rw-r--r--c/src/exec/score/include/rtems/score/Makefile.in6
-rw-r--r--c/src/exec/score/inline/Makefile.in6
-rw-r--r--c/src/exec/score/inline/rtems/score/Makefile.in6
-rw-r--r--c/src/exec/score/macros/Makefile.in6
-rw-r--r--c/src/exec/score/macros/rtems/score/Makefile.in6
-rw-r--r--c/src/exec/score/src/Makefile.in6
-rw-r--r--c/src/exec/score/tools/Makefile.in6
-rw-r--r--c/src/exec/score/tools/generic/Makefile.in6
-rw-r--r--c/src/exec/score/tools/hppa1.1/Makefile.in6
-rw-r--r--c/src/exec/score/tools/unix/Makefile.in6
-rw-r--r--c/src/exec/wrapup/Makefile.in6
-rw-r--r--c/src/exec/wrapup/posix/Makefile.in6
-rw-r--r--c/src/exec/wrapup/rtems/Makefile.in6
58 files changed, 116 insertions, 232 deletions
diff --git a/c/src/exec/Makefile.in b/c/src/exec/Makefile.in
index 71f62fd934..9a173b9141 100644
--- a/c/src/exec/Makefile.in
+++ b/c/src/exec/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
POSIX_DIRS_yes_V=posix
diff --git a/c/src/exec/posix/Makefile.in b/c/src/exec/posix/Makefile.in
index 85c8109ceb..edf011951a 100644
--- a/c/src/exec/posix/Makefile.in
+++ b/c/src/exec/posix/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=base sys headers $(INLINE) optman src
diff --git a/c/src/exec/posix/base/Makefile.in b/c/src/exec/posix/base/Makefile.in
index 7f1f20fb68..1d2e92cca0 100644
--- a/c/src/exec/posix/base/Makefile.in
+++ b/c/src/exec/posix/base/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
#H_PIECES= aio devctl intr limits mqueue pthread sched semaphore \
# signal time unistd
@@ -19,7 +17,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/headers/Makefile.in b/c/src/exec/posix/headers/Makefile.in
index 7e135f5515..543917d7ed 100644
--- a/c/src/exec/posix/headers/Makefile.in
+++ b/c/src/exec/posix/headers/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
H_PIECES= cond condmp config key mutex mutexmp posixapi \
priority psignal pthread pthreadmp seterr threadsup time
@@ -19,7 +17,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in
index 7e135f5515..543917d7ed 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/include/rtems/posix/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
H_PIECES= cond condmp config key mutex mutexmp posixapi \
priority psignal pthread pthreadmp seterr threadsup time
@@ -19,7 +17,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/include/sys/Makefile.in b/c/src/exec/posix/include/sys/Makefile.in
index b7fb6a78ec..d7d9281094 100644
--- a/c/src/exec/posix/include/sys/Makefile.in
+++ b/c/src/exec/posix/include/sys/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
#H_PIECES=utsname
H_PIECES=
@@ -16,7 +14,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/include/wrap/Makefile.in b/c/src/exec/posix/include/wrap/Makefile.in
index 7f1f20fb68..1d2e92cca0 100644
--- a/c/src/exec/posix/include/wrap/Makefile.in
+++ b/c/src/exec/posix/include/wrap/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
#H_PIECES= aio devctl intr limits mqueue pthread sched semaphore \
# signal time unistd
@@ -19,7 +17,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/inline/Makefile.in b/c/src/exec/posix/inline/Makefile.in
index 0de6813316..0b0d64d1ef 100644
--- a/c/src/exec/posix/inline/Makefile.in
+++ b/c/src/exec/posix/inline/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
#I_PIECES= cond intr key mqueue mutex pthread priority semaphore
I_PIECES=cond key mutex pthread priority
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.in b/c/src/exec/posix/inline/rtems/posix/Makefile.in
index 0de6813316..0b0d64d1ef 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/inline/rtems/posix/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
#I_PIECES= cond intr key mqueue mutex pthread priority semaphore
I_PIECES=cond key mutex pthread priority
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/macros/Makefile.in b/c/src/exec/posix/macros/Makefile.in
index 3298f9ee44..d402b7b788 100644
--- a/c/src/exec/posix/macros/Makefile.in
+++ b/c/src/exec/posix/macros/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
# Right now there are not macro implementation of the posix inline routines
# So it won't build
@@ -17,7 +15,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/macros/rtems/posix/Makefile.in b/c/src/exec/posix/macros/rtems/posix/Makefile.in
index 3298f9ee44..d402b7b788 100644
--- a/c/src/exec/posix/macros/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/macros/rtems/posix/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
# Right now there are not macro implementation of the posix inline routines
# So it won't build
@@ -17,7 +15,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/optman/Makefile.in b/c/src/exec/posix/optman/Makefile.in
index 703f4e253d..3c3c4f1887 100644
--- a/c/src/exec/posix/optman/Makefile.in
+++ b/c/src/exec/posix/optman/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
C_FILES=
@@ -19,7 +17,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/posix/src/Makefile.in b/c/src/exec/posix/src/Makefile.in
index c5ba40991c..fbe1778cf9 100644
--- a/c/src/exec/posix/src/Makefile.in
+++ b/c/src/exec/posix/src/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
# following are semi-implemented and untested
# C_PIECES=aio cancel devctl intr mqueue ptimer semaphore time utsname
@@ -21,7 +19,7 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/posix/sys/Makefile.in b/c/src/exec/posix/sys/Makefile.in
index b7fb6a78ec..d7d9281094 100644
--- a/c/src/exec/posix/sys/Makefile.in
+++ b/c/src/exec/posix/sys/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
#H_PIECES=utsname
H_PIECES=
@@ -16,7 +14,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/rtems/Makefile.in b/c/src/exec/rtems/Makefile.in
index c2b406a87d..0ef0ca0e76 100644
--- a/c/src/exec/rtems/Makefile.in
+++ b/c/src/exec/rtems/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=headers $(INLINE) optman src
diff --git a/c/src/exec/rtems/headers/Makefile.in b/c/src/exec/rtems/headers/Makefile.in
index 7c48836cc7..adb4903db8 100644
--- a/c/src/exec/rtems/headers/Makefile.in
+++ b/c/src/exec/rtems/headers/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
H_PIECES=asr attr clock config dpmem event eventmp eventset \
intr message modes mp msgmp options part partmp \
@@ -22,7 +20,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
index 7c48836cc7..adb4903db8 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/include/rtems/rtems/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
H_PIECES=asr attr clock config dpmem event eventmp eventset \
intr message modes mp msgmp options part partmp \
@@ -22,7 +20,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/rtems/inline/Makefile.in b/c/src/exec/rtems/inline/Makefile.in
index ad393906a5..9c11a33172 100644
--- a/c/src/exec/rtems/inline/Makefile.in
+++ b/c/src/exec/rtems/inline/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
I_PIECES=asr attr dpmem event eventset message modes options \
part ratemon region sem status support tasks timer
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
index ad393906a5..9c11a33172 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/inline/rtems/rtems/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
I_PIECES=asr attr dpmem event eventset message modes options \
part ratemon region sem status support tasks timer
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/rtems/macros/Makefile.in b/c/src/exec/rtems/macros/Makefile.in
index ad393906a5..9c11a33172 100644
--- a/c/src/exec/rtems/macros/Makefile.in
+++ b/c/src/exec/rtems/macros/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
I_PIECES=asr attr dpmem event eventset message modes options \
part ratemon region sem status support tasks timer
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
index ad393906a5..9c11a33172 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
+++ b/c/src/exec/rtems/macros/rtems/rtems/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
I_PIECES=asr attr dpmem event eventset message modes options \
part ratemon region sem status support tasks timer
@@ -16,7 +14,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in
index 9b205274ee..41d7274161 100644
--- a/c/src/exec/rtems/optman/Makefile.in
+++ b/c/src/exec/rtems/optman/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
C_FILES= no-dpmem.c no-event.c no-mp.c no-msg.c \
no-part.c no-region.c no-rtmon.c no-sem.c no-signal.c no-timer.c
@@ -22,7 +20,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES)
PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index 54663d5a7c..6cfbefad4f 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/c/src/exec/rtems/src/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
C_PIECES=attr clock dpmem event eventmp intr intrbody mp msg msgmp \
part partmp ratemon region regionmp sem semmp signal signalmp \
@@ -19,7 +17,7 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
SRCS=$(C_FILES)
OBJS=$(C_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/sapi/Makefile.in b/c/src/exec/sapi/Makefile.in
index c2b406a87d..0ef0ca0e76 100644
--- a/c/src/exec/sapi/Makefile.in
+++ b/c/src/exec/sapi/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=headers $(INLINE) optman src
diff --git a/c/src/exec/sapi/headers/Makefile.in b/c/src/exec/sapi/headers/Makefile.in
index 99f369fa7f..a8d70293a2 100644
--- a/c/src/exec/sapi/headers/Makefile.in
+++ b/c/src/exec/sapi/headers/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
H_PIECES= config directives extension fatal init io mptables sptables
H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
@@ -19,7 +17,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/sapi/include/rtems/Makefile.in b/c/src/exec/sapi/include/rtems/Makefile.in
index 99f369fa7f..a8d70293a2 100644
--- a/c/src/exec/sapi/include/rtems/Makefile.in
+++ b/c/src/exec/sapi/include/rtems/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
H_PIECES= config directives extension fatal init io mptables sptables
H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
@@ -19,7 +17,7 @@ EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/sapi/inline/Makefile.in b/c/src/exec/sapi/inline/Makefile.in
index 4094634e95..634df7f643 100644
--- a/c/src/exec/sapi/inline/Makefile.in
+++ b/c/src/exec/sapi/inline/Makefile.in
@@ -4,18 +4,16 @@
@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
I_PIECES= extension
I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/sapi/inline/rtems/Makefile.in b/c/src/exec/sapi/inline/rtems/Makefile.in
index 4094634e95..634df7f643 100644
--- a/c/src/exec/sapi/inline/rtems/Makefile.in
+++ b/c/src/exec/sapi/inline/rtems/Makefile.in
@@ -4,18 +4,16 @@
@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
I_PIECES= extension
I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/sapi/macros/Makefile.in b/c/src/exec/sapi/macros/Makefile.in
index 4094634e95..634df7f643 100644
--- a/c/src/exec/sapi/macros/Makefile.in
+++ b/c/src/exec/sapi/macros/Makefile.in
@@ -4,18 +4,16 @@
@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
I_PIECES= extension
I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/sapi/macros/rtems/Makefile.in b/c/src/exec/sapi/macros/rtems/Makefile.in
index 4094634e95..634df7f643 100644
--- a/c/src/exec/sapi/macros/rtems/Makefile.in
+++ b/c/src/exec/sapi/macros/rtems/Makefile.in
@@ -4,18 +4,16 @@
@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
I_PIECES= extension
I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/sapi/optman/Makefile.in b/c/src/exec/sapi/optman/Makefile.in
index 6ea321c020..7a78007848 100644
--- a/c/src/exec/sapi/optman/Makefile.in
+++ b/c/src/exec/sapi/optman/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
C_FILES= no-ext.c no-io.c
@@ -19,7 +17,7 @@ OBJS=$(C_O_FILES) $(S_O_FILES)
PGMS=$(C_FILES:%.c=$(ARCH)/%.rel)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/sapi/src/Makefile.in b/c/src/exec/sapi/src/Makefile.in
index d44a2573c3..d6f6baa07f 100644
--- a/c/src/exec/sapi/src/Makefile.in
+++ b/c/src/exec/sapi/src/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
C_PIECES= debug extension fatal init io posixapi rtemsapi
C_FILES=$(C_PIECES:%=%.c)
@@ -17,7 +15,7 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
SRCS=$(C_FILES)
OBJS=$(C_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/score/Makefile.in b/c/src/exec/score/Makefile.in
index c72431ed5c..3266e1fc58 100644
--- a/c/src/exec/score/Makefile.in
+++ b/c/src/exec/score/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=headers $(INLINE) tools cpu src
diff --git a/c/src/exec/score/cpu/Makefile.in b/c/src/exec/score/cpu/Makefile.in
index 9ddc6e952e..a4e56fed6e 100644
--- a/c/src/exec/score/cpu/Makefile.in
+++ b/c/src/exec/score/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=$(RTEMS_CPU)
diff --git a/c/src/exec/score/cpu/a29k/Makefile.in b/c/src/exec/score/cpu/a29k/Makefile.in
index 7979835b3d..0cb79271d6 100644
--- a/c/src/exec/score/cpu/a29k/Makefile.in
+++ b/c/src/exec/score/cpu/a29k/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -33,7 +31,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.in b/c/src/exec/score/cpu/hppa1.1/Makefile.in
index 80f5418a8f..964acc8eff 100644
--- a/c/src/exec/score/cpu/hppa1.1/Makefile.in
+++ b/c/src/exec/score/cpu/hppa1.1/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -31,7 +29,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in
index beffa70256..6a70c9e978 100644
--- a/c/src/exec/score/cpu/i386/Makefile.in
+++ b/c/src/exec/score/cpu/i386/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -31,7 +29,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in
index a828f32476..6d7a120914 100644
--- a/c/src/exec/score/cpu/i960/Makefile.in
+++ b/c/src/exec/score/cpu/i960/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -31,7 +29,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in
index 8c30462b40..e95602eb98 100644
--- a/c/src/exec/score/cpu/m68k/Makefile.in
+++ b/c/src/exec/score/cpu/m68k/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -31,7 +29,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.in b/c/src/exec/score/cpu/mips64orion/Makefile.in
index bf1e7f5f88..a8135c3bc6 100644
--- a/c/src/exec/score/cpu/mips64orion/Makefile.in
+++ b/c/src/exec/score/cpu/mips64orion/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -33,7 +31,7 @@ S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.in b/c/src/exec/score/cpu/no_cpu/Makefile.in
index 4d78f51049..3c6f5a4044 100644
--- a/c/src/exec/score/cpu/no_cpu/Makefile.in
+++ b/c/src/exec/score/cpu/no_cpu/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -33,7 +31,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/powerpc/Makefile.in b/c/src/exec/score/cpu/powerpc/Makefile.in
index 4cb77f0115..48c991b2f7 100644
--- a/c/src/exec/score/cpu/powerpc/Makefile.in
+++ b/c/src/exec/score/cpu/powerpc/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -33,7 +31,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in
index 481608c85e..67cb44ca7b 100644
--- a/c/src/exec/score/cpu/sparc/Makefile.in
+++ b/c/src/exec/score/cpu/sparc/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -30,7 +28,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in
index 244c787974..45aa102ed1 100644
--- a/c/src/exec/score/cpu/unix/Makefile.in
+++ b/c/src/exec/score/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
RELS=$(ARCH)/rtems-cpu.rel
@@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/headers/Makefile.in b/c/src/exec/score/headers/Makefile.in
index c8eb6f91ca..225f7e5bab 100644
--- a/c/src/exec/score/headers/Makefile.in
+++ b/c/src/exec/score/headers/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
# H_FILES that get installed in the rtems/score subdirectoy
H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \
@@ -30,7 +28,7 @@ NET_H_FILES=$(NET_H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES) $(SAPI_H_FILES) $(EXTERNAL_H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in
index c8eb6f91ca..225f7e5bab 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.in
+++ b/c/src/exec/score/include/rtems/score/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
# H_FILES that get installed in the rtems/score subdirectoy
H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \
@@ -30,7 +28,7 @@ NET_H_FILES=$(NET_H_PIECES:%=$(srcdir)/%.h)
SRCS=$(H_FILES) $(SAPI_H_FILES) $(EXTERNAL_H_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/c/src/exec/score/inline/Makefile.in b/c/src/exec/score/inline/Makefile.in
index 073fc981ca..f97d3bfcf3 100644
--- a/c/src/exec/score/inline/Makefile.in
+++ b/c/src/exec/score/inline/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
I_PIECES= address chain coremsg coremutex coresem heap \
isr mppkt object objectmp priority stack states sysstate thread \
@@ -17,7 +15,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/score/inline/rtems/score/Makefile.in b/c/src/exec/score/inline/rtems/score/Makefile.in
index 073fc981ca..f97d3bfcf3 100644
--- a/c/src/exec/score/inline/rtems/score/Makefile.in
+++ b/c/src/exec/score/inline/rtems/score/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
I_PIECES= address chain coremsg coremutex coresem heap \
isr mppkt object objectmp priority stack states sysstate thread \
@@ -17,7 +15,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/score/macros/Makefile.in b/c/src/exec/score/macros/Makefile.in
index 073fc981ca..f97d3bfcf3 100644
--- a/c/src/exec/score/macros/Makefile.in
+++ b/c/src/exec/score/macros/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
I_PIECES= address chain coremsg coremutex coresem heap \
isr mppkt object objectmp priority stack states sysstate thread \
@@ -17,7 +15,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/score/macros/rtems/score/Makefile.in b/c/src/exec/score/macros/rtems/score/Makefile.in
index 073fc981ca..f97d3bfcf3 100644
--- a/c/src/exec/score/macros/rtems/score/Makefile.in
+++ b/c/src/exec/score/macros/rtems/score/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
I_PIECES= address chain coremsg coremutex coresem heap \
isr mppkt object objectmp priority stack states sysstate thread \
@@ -17,7 +15,7 @@ I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
SRCS=$(I_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/score/src/Makefile.in b/c/src/exec/score/src/Makefile.in
index faa08b455e..3799b123f1 100644
--- a/c/src/exec/score/src/Makefile.in
+++ b/c/src/exec/score/src/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
# C and C++ source names, if any, go here -- minus the .c or .cc
C_PIECES=apiext chain coremsg coremutex coresem heap interr \
@@ -20,7 +18,7 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
SRCS=$(C_FILES)
OBJS=$(C_O_FILES)
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/score/tools/Makefile.in b/c/src/exec/score/tools/Makefile.in
index c45dd64a77..6dba1f38f6 100644
--- a/c/src/exec/score/tools/Makefile.in
+++ b/c/src/exec/score/tools/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/c/src/exec/score/tools/generic/Makefile.in b/c/src/exec/score/tools/generic/Makefile.in
index 5aeeaf871f..419b20b96c 100644
--- a/c/src/exec/score/tools/generic/Makefile.in
+++ b/c/src/exec/score/tools/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/c/src/exec/score/tools/hppa1.1/Makefile.in b/c/src/exec/score/tools/hppa1.1/Makefile.in
index c83dfc3353..c5cdbb753e 100644
--- a/c/src/exec/score/tools/hppa1.1/Makefile.in
+++ b/c/src/exec/score/tools/hppa1.1/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 genoffsets. Hopefully it has same alignment!!
USE_HOST_COMPILER=yes
@@ -25,7 +23,7 @@ OBJS=$(C_O_FILES)
PGMS=${ARCH}/genoffsets
-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/c/src/exec/score/tools/unix/Makefile.in b/c/src/exec/score/tools/unix/Makefile.in
index 9176b7f5b1..6041f15730 100644
--- a/c/src/exec/score/tools/unix/Makefile.in
+++ b/c/src/exec/score/tools/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/c/src/exec/wrapup/Makefile.in b/c/src/exec/wrapup/Makefile.in
index c381c68568..6a0ddd8187 100644
--- a/c/src/exec/wrapup/Makefile.in
+++ b/c/src/exec/wrapup/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
POSIX_DIRS_yes_V=posix
diff --git a/c/src/exec/wrapup/posix/Makefile.in b/c/src/exec/wrapup/posix/Makefile.in
index 077d7c4536..b9228360b1 100644
--- a/c/src/exec/wrapup/posix/Makefile.in
+++ b/c/src/exec/wrapup/posix/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
#
# This is really temporary until posix is more an integral part of the tree.
@@ -21,7 +19,7 @@ POSIX_OBJS=$(wildcard ../../posix/src/$(ARCH)/*.o)
OBJS=$(CPU_OBJS) $(CORE_OBJS) $(POSIX_OBJS) $(SAPI_OBJS)
LIB=$(ARCH)/libposix.a
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
diff --git a/c/src/exec/wrapup/rtems/Makefile.in b/c/src/exec/wrapup/rtems/Makefile.in
index 064652c1db..e0382e4fd5 100644
--- a/c/src/exec/wrapup/rtems/Makefile.in
+++ b/c/src/exec/wrapup/rtems/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
CPU_OBJS=$(wildcard ../../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
CORE_OBJS=$(wildcard ../../score/src/$(ARCH)/*.o)
@@ -18,7 +16,7 @@ RTEMS_OBJS=$(wildcard ../../rtems/src/$(ARCH)/*.o)
OBJS=$(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS)
LIB=$(ARCH)/librtems.a
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#