summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/Makefile.in6
-rw-r--r--make/Templates/Makefile.dir2
-rw-r--r--make/Templates/Makefile.inc.in3
-rw-r--r--make/Templates/Makefile.leaf2
-rw-r--r--make/Templates/Makefile.lib2
-rw-r--r--make/target.cfg.in5
6 files changed, 9 insertions, 11 deletions
diff --git a/make/Makefile.in b/make/Makefile.in
index 16f78c6e5a..b0b46da19b 100644
--- a/make/Makefile.in
+++ b/make/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
CLEAN_ADDITIONS +=
diff --git a/make/Templates/Makefile.dir b/make/Templates/Makefile.dir
index 36d056bcd8..e70d40c0cb 100644
--- a/make/Templates/Makefile.dir
+++ b/make/Templates/Makefile.dir
@@ -2,7 +2,7 @@
# $Id$
#
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/directory.cfg
SUB_DIRS=a b c your-directories-go-here
diff --git a/make/Templates/Makefile.inc.in b/make/Templates/Makefile.inc.in
index edaf5e7dfd..6fd57a5f3f 100644
--- a/make/Templates/Makefile.inc.in
+++ b/make/Templates/Makefile.inc.in
@@ -40,6 +40,9 @@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@
RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@
RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
+# FIXME: This shouldn't be here
+RTEMS_ROOT = $(PROJECT_HOME)
+
export RTEMS_BSP
export RTEMS_CUSTOM
export PROJECT_ROOT
diff --git a/make/Templates/Makefile.leaf b/make/Templates/Makefile.leaf
index 5bf8e08fe2..6f098d4b50 100644
--- a/make/Templates/Makefile.leaf
+++ b/make/Templates/Makefile.leaf
@@ -34,7 +34,7 @@ PGMS=${ARCH}/xxx-your-program-here ${ARCH}/xxx-another-one
MANAGERS=io event message rate_monotonic semaphore timer, etc.
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
diff --git a/make/Templates/Makefile.lib b/make/Templates/Makefile.lib
index 3c339a7054..18baaedbaa 100644
--- a/make/Templates/Makefile.lib
+++ b/make/Templates/Makefile.lib
@@ -27,7 +27,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/lib.cfg
#
diff --git a/make/target.cfg.in b/make/target.cfg.in
index b29c5baa6a..781182e742 100644
--- a/make/target.cfg.in
+++ b/make/target.cfg.in
@@ -1,6 +1,6 @@
#
#
-# Target specific settings. To be included in application Makefiles.
+# Target specific settings.
#
prefix = @prefix@
@@ -36,8 +36,6 @@ export AR
export SIZE
export OBJCOPY
-
-RTEMS_ROOT = @RTEMS_ROOT@
RTEMS_HOST = @RTEMS_HOST@
RTEMS_USE_OWN_PDIR = @RTEMS_USE_OWN_PDIR@
RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
@@ -46,7 +44,6 @@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@
RTEMS_USE_MACROS = @RTEMS_USE_MACROS@
RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@
RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
INSTALL=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
XCFLAGS=$(CFLAGS_FOR_TARGET)