diff options
480 files changed, 974 insertions, 1924 deletions
diff --git a/Makefile.in b/Makefile.in index ee55f0a0e0..61a8f0a95f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,7 +20,7 @@ program_prefix = @program_prefix@ export bindir -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH=@srcdir@ @@ -29,23 +29,17 @@ ifeq ($(RTEMS_BSP),) RTEMS_BSP = @RTEMS_BSP_LIST@ endif -MAKE_CONFIG_EXTRA_DIR_PART=c/ - include $(RTEMS_ROOT)/make/main.cfg MTARGETS = all install $(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_all) \ $(TARGET_VARIANTS:%=%_install) $(TARGET_VARIANTS:%=%_tests) \ clean_wrapup distclean clean_dirs clean_tools tests clean depend -.PHONY: - EXIT_CMD = exit 1 # Don't pass flags from previous make - especially NOT CFLAGS override MAKEFLAGS= -# \"XCFLAGS=$(CFLAGS_FOR_TARGET)\" - $(MTARGETS): BASEDIR=`pwd`; \ for bsp in $(RTEMS_BSP) xxx; \ diff --git a/c/Makefile.in b/c/Makefile.in index 394b6e79b4..c7f09b8eca 100644 --- a/c/Makefile.in +++ b/c/Makefile.in @@ -7,7 +7,6 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -18,11 +17,10 @@ manext = 1 mandir = @mandir@/man$(manext) program_prefix = @program_prefix@ 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=build-tools src diff --git a/c/build-tools/Makefile.in b/c/build-tools/Makefile.in index 532bd01b67..ad819e8214 100644 --- a/c/build-tools/Makefile.in +++ b/c/build-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=os scripts src diff --git a/c/build-tools/os/Makefile.in b/c/build-tools/os/Makefile.in index 84fd6418ce..d540e58fa0 100644 --- a/c/build-tools/os/Makefile.in +++ b/c/build-tools/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/c/build-tools/os/msdos/Makefile.in b/c/build-tools/os/msdos/Makefile.in index c11aacc1b3..4a060f7c37 100644 --- a/c/build-tools/os/msdos/Makefile.in +++ b/c/build-tools/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/c/build-tools/scripts/Makefile.in b/c/build-tools/scripts/Makefile.in index 42ee76837d..db02f4736c 100644 --- a/c/build-tools/scripts/Makefile.in +++ b/c/build-tools/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/c/build-tools/src/Makefile.in b/c/build-tools/src/Makefile.in index a24e9c264a..e94656cd6c 100644 --- a/c/build-tools/src/Makefile.in +++ b/c/build-tools/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/c/src/Makefile.in b/c/src/Makefile.in index e44019b406..caaf179f90 100644 --- a/c/src/Makefile.in +++ b/c/src/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=exec lib tests/tools tests/support tests/samples 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 # diff --git a/c/src/lib/Makefile.in b/c/src/lib/Makefile.in index 6eb1916e78..d2d137cddd 100644 --- a/c/src/lib/Makefile.in +++ b/c/src/lib/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 # We only build the KA9Q library if HAS_KA9Q was defined diff --git a/c/src/lib/include/Makefile.in b/c/src/lib/include/Makefile.in index 86bf331a3e..690a369d56 100644 --- a/c/src/lib/include/Makefile.in +++ b/c/src/lib/include/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=console clockdrv iosupp ringbuf \ spurious timerdrv vmeintr @@ -38,7 +36,7 @@ RTEMSCPLUSPLUS_H_FILES=$(RTEMSCPLUSPLUS_H_PIECES:%=$(srcdir)/rtems++/%.h) SRCS=$(H_FILES) $(SYS_H_FILES) \ $(KA9Q_H_FILES) $(MOTOROLA_H_FILES) $(RTEMSCPLUSPLUS_H_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += diff --git a/c/src/lib/libbsp/Makefile.in b/c/src/lib/libbsp/Makefile.in index 8e0859aebc..b7dada202d 100644 --- a/c/src/lib/libbsp/Makefile.in +++ b/c/src/lib/libbsp/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 # mptests are the multiprocessing test suite diff --git a/c/src/lib/libbsp/a29k/Makefile.in b/c/src/lib/libbsp/a29k/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/a29k/Makefile.in +++ b/c/src/lib/libbsp/a29k/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/a29k/portsw/Makefile.in b/c/src/lib/libbsp/a29k/portsw/Makefile.in index 787e07bf07..48f89c3690 100644 --- a/c/src/lib/libbsp/a29k/portsw/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/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 SRCS=README diff --git a/c/src/lib/libbsp/a29k/portsw/console/Makefile.in b/c/src/lib/libbsp/a29k/portsw/console/Makefile.in index d5bfce11fa..a7cdd9f374 100644 --- a/c/src/lib/libbsp/a29k/portsw/console/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/console/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 PGM=${ARCH}/console.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/lib/libbsp/a29k/portsw/include/Makefile.in b/c/src/lib/libbsp/a29k/portsw/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/a29k/portsw/include/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in b/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in index 912d23707b..b4967b93cb 100644 --- a/c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/shmsupp/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 PGM=${ARCH}/shmsupp.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/lib/libbsp/a29k/portsw/start/Makefile.in b/c/src/lib/libbsp/a29k/portsw/start/Makefile.in index 9957ff775d..f89c5a7e6f 100644 --- a/c/src/lib/libbsp/a29k/portsw/start/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/start/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 source names, if any, go here -- minus the .c C_PIECES= @@ -25,7 +23,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 PGM=${ARCH}/crt0.o ${ARCH}/register.o diff --git a/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in b/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in index 1a26bca48b..386585747c 100644 --- a/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=ramlink romlink $(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/lib/libbsp/a29k/portsw/wrapup/Makefile.in b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in index 76af4e8c2c..122f945c4e 100644 --- a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in +++ b/c/src/lib/libbsp/a29k/portsw/wrapup/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 BSP_PIECES=startup console iic ethernet flash nvram CPU_PIECES=clock timer @@ -20,7 +18,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/hppa1.1/Makefile.in b/c/src/lib/libbsp/hppa1.1/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/hppa1.1/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in index 082fa37548..8a1f64f2b2 100644 --- a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in @@ -10,13 +10,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 SRCS=$(srcdir)/floss-bsp.h diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in index 8eb7a652d3..f5b7ef0799 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in index 0795a3b80f..51b045ba95 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/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 = bsp coverhd H_FILES=$(H_PIECES:%=$(srcdir)/%.h) @@ -32,7 +30,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in index 67789ddd09..8825079da7 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/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 PGM=${ARCH}/shmsupp.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in index 533c96af05..a7a7ac9382 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -30,7 +28,7 @@ OBJS=$(C_O_FILES) # so it can be easily place correctly by the compiler config file. INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in index 9e3e488c87..d4af1bb269 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/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}/print_dump -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in index 6722f5faec..62f75c3b3d 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tty/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 PGM=${ARCH}/tty.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in index ea0e112463..c072dea725 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/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 BSP_PIECES=startup tty shmsupp # pieces to pick up out of libcpu/hppa @@ -23,7 +21,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/i386/Makefile.in b/c/src/lib/libbsp/i386/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/i386/Makefile.in +++ b/c/src/lib/libbsp/i386/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/i386/force386/Makefile.in b/c/src/lib/libbsp/i386/force386/Makefile.in index 0e705b50ab..7a8d6260ed 100644 --- a/c/src/lib/libbsp/i386/force386/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/i386/force386/clock/Makefile.in b/c/src/lib/libbsp/i386/force386/clock/Makefile.in index 0e980c84a5..d882f1d00f 100644 --- a/c/src/lib/libbsp/i386/force386/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg diff --git a/c/src/lib/libbsp/i386/force386/console/Makefile.in b/c/src/lib/libbsp/i386/force386/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/i386/force386/console/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i386/force386/include/Makefile.in b/c/src/lib/libbsp/i386/force386/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/i386/force386/include/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in b/c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in index 71f9604301..031a0aa0cd 100644 --- a/c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/shmsupp/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 PGM=${ARCH}/shmsupp.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i386/force386/startup/Makefile.in b/c/src/lib/libbsp/i386/force386/startup/Makefile.in index b0bff1117f..639fcbdc32 100644 --- a/c/src/lib/libbsp/i386/force386/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/i386/force386/timer/Makefile.in b/c/src/lib/libbsp/i386/force386/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/i386/force386/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/i386/force386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in index 2ab7a96f34..4dc4ea5208 100644 --- a/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/wrapup/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 BSP_PIECES=startup clock console shmsupp timer GENERIC_PIECES=shmdr @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/i386/go32/Makefile.in b/c/src/lib/libbsp/i386/go32/Makefile.in index d5841e6c82..0a2d61ae80 100644 --- a/c/src/lib/libbsp/i386/go32/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/i386/go32/clock/Makefile.in b/c/src/lib/libbsp/i386/go32/clock/Makefile.in index ec27456af5..c8c96b56d2 100644 --- a/c/src/lib/libbsp/i386/go32/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg diff --git a/c/src/lib/libbsp/i386/go32/console/Makefile.in b/c/src/lib/libbsp/i386/go32/console/Makefile.in index f98f6e82b2..52e68a2b52 100644 --- a/c/src/lib/libbsp/i386/go32/console/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i386/go32/include/Makefile.in b/c/src/lib/libbsp/i386/go32/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/i386/go32/include/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/i386/go32/startup/Makefile.in b/c/src/lib/libbsp/i386/go32/startup/Makefile.in index af24a6e635..a974a158f5 100644 --- a/c/src/lib/libbsp/i386/go32/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i386/go32/timer/Makefile.in b/c/src/lib/libbsp/i386/go32/timer/Makefile.in index 6e088dc1e5..2b32db0b00 100644 --- a/c/src/lib/libbsp/i386/go32/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/timer/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 PGM=${ARCH}/timer.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/lib/libbsp/i386/go32/wrapup/Makefile.in b/c/src/lib/libbsp/i386/go32/wrapup/Makefile.in index 8c55efd022..714d2d51ea 100644 --- a/c/src/lib/libbsp/i386/go32/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/go32/wrapup/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 BSP_PIECES=startup clock console timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.in b/c/src/lib/libbsp/i386/i386ex/Makefile.in index c67c49f650..59f67b5c4e 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in index 34c6782b64..e40e10fb1a 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/clock/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 PGM=${ARCH}/clock.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/lib/libbsp/i386/i386ex/console/Makefile.in b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in index bb29533369..c1f28bc4c4 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/console/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 PGM=${ARCH}/console.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/lib/libbsp/i386/i386ex/include/Makefile.in b/c/src/lib/libbsp/i386/i386ex/include/Makefile.in index 420847fddf..096f514e64 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in index 67fa1d7a03..9f6b78a6d0 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -31,7 +29,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(srcdir)/linkcmds $(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/lib/libbsp/i386/i386ex/timer/Makefile.in b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in index 6e088dc1e5..2b32db0b00 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/timer/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 PGM=${ARCH}/timer.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/lib/libbsp/i386/i386ex/wrapup/Makefile.in b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in index 8c55efd022..714d2d51ea 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/wrapup/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 BSP_PIECES=startup clock console timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.in b/c/src/lib/libbsp/i386/pc386/Makefile.in index 455559dacb..9e5e08f345 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/i386/pc386/clock/Makefile.in b/c/src/lib/libbsp/i386/pc386/clock/Makefile.in index ec27456af5..c8c96b56d2 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.in b/c/src/lib/libbsp/i386/pc386/console/Makefile.in index 80ea4fa297..2d22757c7c 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.in b/c/src/lib/libbsp/i386/pc386/include/Makefile.in index 749d860ccf..09228bd496 100644 --- a/c/src/lib/libbsp/i386/pc386/include/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/irq.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.in b/c/src/lib/libbsp/i386/pc386/start/Makefile.in index dc30ad4277..388e25b482 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/start/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 PGMS=${ARCH}/start.o @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/i386/pc386/startup/Makefile.in b/c/src/lib/libbsp/i386/pc386/startup/Makefile.in index 82969dfd65..7c775413d5 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/i386/pc386/timer/Makefile.in b/c/src/lib/libbsp/i386/pc386/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/i386/pc386/tools/Makefile.in b/c/src/lib/libbsp/i386/pc386/tools/Makefile.in index cfa3b49ff8..9878f86eec 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/tools/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 exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ @@ -35,7 +33,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) PGMS=$(ARCH)/bin2boot -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in index 5d9592b29a..a42a827299 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/wrapup/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 BSP_PIECES=startup clock console timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/i960/Makefile.in b/c/src/lib/libbsp/i960/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/i960/Makefile.in +++ b/c/src/lib/libbsp/i960/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.in b/c/src/lib/libbsp/i960/cvme961/Makefile.in index 0e705b50ab..7a8d6260ed 100644 --- a/c/src/lib/libbsp/i960/cvme961/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in index 7f985380de..59df4f2702 100644 --- a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/console/Makefile.in b/c/src/lib/libbsp/i960/cvme961/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/i960/cvme961/console/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in b/c/src/lib/libbsp/i960/cvme961/include/Makefile.in index b4103ce041..8cf95dc7c3 100644 --- a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -27,7 +25,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in index 71f9604301..031a0aa0cd 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/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 PGM=${ARCH}/shmsupp.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in b/c/src/lib/libbsp/i960/cvme961/start/Makefile.in index e726972629..68dcd2196e 100644 --- a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/start/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 source names, if any, go here -- minus the .c C_PIECES= @@ -25,7 +23,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(S_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg PGM=${ARCH}/start.o diff --git a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in index 2b0cfc3f4c..514cf8fdcc 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/i960/cvme961/wrapup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in index 58e3074729..11ca32d8c7 100644 --- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/wrapup/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 BSP_PIECES=startup clock console shmsupp timer GENERIC_PIECES=shmdr @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/Makefile.in b/c/src/lib/libbsp/m68k/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/m68k/Makefile.in +++ b/c/src/lib/libbsp/m68k/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/Makefile.in index da46d5cae9..ca0590d55a 100644 --- a/c/src/lib/libbsp/m68k/dmv152/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in index 7f985380de..59df4f2702 100644 --- a/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in index 9545ffa42a..871175f129 100644 --- a/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/spurious/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 PGM=${ARCH}/spurious.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in index f6756e6cdf..6f35d68576 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/dmv152/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in index 004ea725a4..3ef5e9d4bb 100644 --- a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/wrapup/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 BSP_PIECES=startup clock console spurious timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/efi332/Makefile.in b/c/src/lib/libbsp/m68k/efi332/Makefile.in index 9df3b663e3..21c1abc2c8 100644 --- a/c/src/lib/libbsp/m68k/efi332/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/m68k/efi332/clock/Makefile.in b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.in index 7f985380de..59df4f2702 100644 --- a/c/src/lib/libbsp/m68k/efi332/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi332/console/Makefile.in b/c/src/lib/libbsp/m68k/efi332/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/efi332/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi332/include/Makefile.in b/c/src/lib/libbsp/m68k/efi332/include/Makefile.in index dc753f06c1..145f554e29 100644 --- a/c/src/lib/libbsp/m68k/efi332/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/include/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 = $(srcdir)/bsp.h $(srcdir)/efi332.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in index 9545ffa42a..871175f129 100644 --- a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/spurious/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 PGM=${ARCH}/spurious.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi332/start/Makefile.in b/c/src/lib/libbsp/m68k/efi332/start/Makefile.in index bebe375d46..2373aeca0b 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/start/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 PGM=${ARCH}/start332.o @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi332/start332/Makefile.in b/c/src/lib/libbsp/m68k/efi332/start332/Makefile.in index bebe375d46..2373aeca0b 100644 --- a/c/src/lib/libbsp/m68k/efi332/start332/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/start332/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 PGM=${ARCH}/start332.o @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in index 98a6c4db7c..f1d3bbcec9 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in index 15c782a9d0..d9e6e84a0c 100644 --- a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/timer/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 PGM=${ARCH}/timer.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in index 004ea725a4..3ef5e9d4bb 100644 --- a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/wrapup/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 BSP_PIECES=startup clock console spurious timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/efi68k/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/Makefile.in index 1b46881310..e283e32211 100644 --- a/c/src/lib/libbsp/m68k/efi68k/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.in index 7f985380de..59df4f2702 100644 --- a/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi68k/console/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/efi68k/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/include/Makefile.in index fe5b44c1d9..e58a318be3 100644 --- a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/include/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 = $(srcdir)/bsp.h $(srcdir)/efi68k.h $(srcdir)/16550.h \ $(srcdir)/DP8570A.h $(srcdir)/coverhd.h @@ -25,7 +23,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.in index 9545ffa42a..871175f129 100644 --- a/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/spurious/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 PGM=${ARCH}/spurious.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.in index 6ec73e686c..ddd45a4c24 100644 --- a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/start/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 PGM=${ARCH}/start68k.o @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi68k/start68k/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/start68k/Makefile.in index 6ec73e686c..ddd45a4c24 100644 --- a/c/src/lib/libbsp/m68k/efi68k/start68k/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/start68k/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 PGM=${ARCH}/start68k.o @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in index 6942e64fd9..9fe7e342b2 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.in index 15c782a9d0..d9e6e84a0c 100644 --- a/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/timer/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 PGM=${ARCH}/timer.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in index 004ea725a4..3ef5e9d4bb 100644 --- a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi68k/wrapup/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 BSP_PIECES=startup clock console spurious timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/Makefile.in index ffd586de55..e53f5417f5 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/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 SRCS=README diff --git a/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.in index 7f985380de..59df4f2702 100644 --- a/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in index 3a243bf8ee..d96348b19d 100644 --- a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/start/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 PGMS=${ARCH}/start302.o @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/gen68302/start302/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/start302/Makefile.in index 3a243bf8ee..d96348b19d 100644 --- a/c/src/lib/libbsp/m68k/gen68302/start302/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/start302/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 PGMS=${ARCH}/start302.o @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/gen68302/startup/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.in index 98a6c4db7c..f1d3bbcec9 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/gen68302/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in index 5d9592b29a..a42a827299 100644 --- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/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 BSP_PIECES=startup clock console timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/Makefile.in index 0ee8a42337..b5c08f7542 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/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 SRCS=README diff --git a/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in index 7f985380de..59df4f2702 100644 --- a/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68360/console/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/gen68360/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in index fb5877615d..262e5be2b2 100644 --- a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/network/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 PGM=${ARCH}/network.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in index 37b60f348b..4d339f46fc 100644 --- a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/start/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 PGMS=${ARCH}/start360.o @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/gen68360/start360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/start360/Makefile.in index 37b60f348b..4d339f46fc 100644 --- a/c/src/lib/libbsp/m68k/gen68360/start360/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/start360/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 PGMS=${ARCH}/start360.o @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/gen68360/startup/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in index da7f977602..0b66c9387e 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -23,7 +21,7 @@ SRCS=$(srcdir)/linkcmds $(srcdir)/linkcmds.prom $(srcdir)/linkcmds.bootp \ $(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) $(CC_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in index 15c782a9d0..d9e6e84a0c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/timer/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 PGM=${ARCH}/timer.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in index 9be252062c..3f150338dd 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/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 only build the ka9q device driver if HAS_KA9Q was defined KA9Q_DRIVER_yes_V = network @@ -27,7 +25,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.in b/c/src/lib/libbsp/m68k/idp/Makefile.in index d5841e6c82..0a2d61ae80 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/m68k/idp/clock/Makefile.in b/c/src/lib/libbsp/m68k/idp/clock/Makefile.in index c8f0e617c5..284cab93fb 100644 --- a/c/src/lib/libbsp/m68k/idp/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg diff --git a/c/src/lib/libbsp/m68k/idp/console/Makefile.in b/c/src/lib/libbsp/m68k/idp/console/Makefile.in index 3f596a02ee..1990e445b1 100644 --- a/c/src/lib/libbsp/m68k/idp/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/idp/include/Makefile.in b/c/src/lib/libbsp/m68k/idp/include/Makefile.in index bca9801942..730a0de2ba 100644 --- a/c/src/lib/libbsp/m68k/idp/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/leds.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/idp/startup/Makefile.in b/c/src/lib/libbsp/m68k/idp/startup/Makefile.in index 182cd16d56..5d0618fcda 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/idp/timer/Makefile.in b/c/src/lib/libbsp/m68k/idp/timer/Makefile.in index bacebc5309..0c8ec3ccaa 100644 --- a/c/src/lib/libbsp/m68k/idp/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/idp/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in index 2d584b1056..72cc6fe051 100644 --- a/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/wrapup/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 BSP_PIECES=startup clock console timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/Makefile.in index 0e705b50ab..7a8d6260ed 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in index 0e980c84a5..d882f1d00f 100644 --- a/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg diff --git a/c/src/lib/libbsp/m68k/mvme136/console/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/mvme136/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in index 71f9604301..031a0aa0cd 100644 --- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/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 PGM=${ARCH}/shmsupp.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in index 883e0b7a95..6937330b60 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/mvme136/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in index 2ab7a96f34..4dc4ea5208 100644 --- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/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 BSP_PIECES=startup clock console shmsupp timer GENERIC_PIECES=shmdr @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/Makefile.in index d5841e6c82..0a2d61ae80 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/m68k/mvme147/clock/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/clock/Makefile.in index 0e980c84a5..d882f1d00f 100644 --- a/c/src/lib/libbsp/m68k/mvme147/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg diff --git a/c/src/lib/libbsp/m68k/mvme147/console/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/mvme147/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme147/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in index 883e0b7a95..6937330b60 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/mvme147/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in index de9e303f38..33d990d882 100644 --- a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/wrapup/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 BSP_PIECES=startup clock console timer # shmsupp GENERIC_PIECES=# shmdr @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in index 1c30053c28..c1ea214afa 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in index 774f8bc600..14cead6a85 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../mvme147/clock -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in index 3309c2d340..77c95fbbc0 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../mvme147/console -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.in index 985ed1af4f..9e3fb34ccf 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/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 PGM=${ARCH}/shmsupp.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in index 98c74e17a9..d42d523f17 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../mvme147/startup:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(srcdir)/linkcmds $(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in index b18981cd12..c12e535ace 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../mvme147/timer -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ H_FILES= SRCS=$(C_FILES) $(S_FILES) $(H_FILES) OBJS=$(C_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/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in index 006e122dad..8c70b9398f 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/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 BSP_PIECES=startup clock console timer shmsupp GENERIC_PIECES=shmdr @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/Makefile.in index 171a96d778..c2a39d2801 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/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 SRCS=README diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.in index 0e980c84a5..d882f1d00f 100644 --- a/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg diff --git a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in index f14839ec24..0c6f80fe05 100644 --- a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/consolex/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 PGM=${ARCH}/consolex.rel @@ -22,7 +20,7 @@ H_FILES=consolex.h SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/include/Makefile.in index 947dc0697a..4481844fc4 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/page_table.h \ $(srcdir)/tod.h @@ -25,7 +23,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in index e80b20bd1d..4fb4b346b3 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/mvme162/tod/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.in index d66d381e80..964508d2ab 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/tod/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 PGM=${ARCH}/tod.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in index 5559c11978..afd7a71b9a 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/tools/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}/sload -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in index e750b064ae..45d702bda3 100644 --- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/wrapup/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 BSP_PIECES=startup clock console timer tod CPU_PIECES= @@ -24,7 +22,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/Makefile.in index ffd586de55..e53f5417f5 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/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 SRCS=README diff --git a/c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in index 7f985380de..59df4f2702 100644 --- a/c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/ods68302/console/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/m68k/ods68302/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/include/Makefile.in index 0612ba924e..8184e09eab 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/include/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 = $(srcdir)/bare.h $(srcdir)/bsp.h \ $(srcdir)/coverhd.h $(srcdir)/crc.h \ @@ -27,7 +25,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in index 5c6401617b..a6d3ba2c08 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/start/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 PGM=${ARCH}/start302.o @@ -34,7 +32,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(S_O_FILES) $(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in index 5c6401617b..a6d3ba2c08 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/start302/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 PGM=${ARCH}/start302.o @@ -34,7 +32,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(S_O_FILES) $(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in index d9cea81b97..95f0c8b323 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -23,7 +21,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) $(srcdir)/rom $(srcdir)/debugger OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in index 62d7c793d5..24809cbed8 100644 --- a/c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/timer/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 PGM=${ARCH}/timer.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/m68k/ods68302/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in index 5d9592b29a..a42a827299 100644 --- a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/wrapup/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 BSP_PIECES=startup clock console timer GENERIC_PIECES= @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/mips64orion/Makefile.in b/c/src/lib/libbsp/mips64orion/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/mips64orion/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/mips64orion/p4000/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/Makefile.in index 7a65fc9e39..d888592a37 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/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 SRCS=README diff --git a/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.in index f2be9a0155..e8817eb290 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/console/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/console/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 PGM=${ARCH}/console.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/lib/libbsp/mips64orion/p4000/include/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.in index ec17b61794..c50b8c5884 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/liblnk/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 PGM=${ARCH}/liblnk.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/lib/libbsp/mips64orion/p4000/start/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in index 7e78dfb2b1..046969120a 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/start/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 source names, if any, go here -- minus the .c C_PIECES= @@ -25,7 +23,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 PGM=${ARCH}/idt_csu.o diff --git a/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.in index 589a574ecf..f7bcfe9d6e 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) SRCS=ghlinkcmds linkcmds $(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/lib/libbsp/mips64orion/p4000/wrapup/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.in index daef142997..2b2834341f 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/wrapup/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 BSP_PIECES=startup console liblnk CPU_PIECES=clock timer @@ -20,7 +18,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/no_cpu/Makefile.in b/c/src/lib/libbsp/no_cpu/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/no_cpu/Makefile.in +++ b/c/src/lib/libbsp/no_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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in index 195205d3fa..1a32c77d85 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/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 SRCS=README diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in index 74d158bd09..48b1c93ac7 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/clock/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 PGM=${ARCH}/clock.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/lib/libbsp/no_cpu/no_bsp/console/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in index 77caa485be..b73d23df40 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/console/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 PGM=${ARCH}/console.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/lib/libbsp/no_cpu/no_bsp/include/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in index 912d23707b..b4967b93cb 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/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 PGM=${ARCH}/shmsupp.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/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in index 3bcdd0e332..ff3daab211 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=linkcmds $(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/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in index 3366175c3f..076b7f4e77 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/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 PGM=${ARCH}/timer.rel @@ -29,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/leaf.cfg # diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in index 2ab7a96f34..4dc4ea5208 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/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 BSP_PIECES=startup clock console shmsupp timer GENERIC_PIECES=shmdr @@ -18,7 +16,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/powerpc/Makefile.in b/c/src/lib/libbsp/powerpc/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/powerpc/Makefile.in +++ b/c/src/lib/libbsp/powerpc/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/powerpc/papyrus/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/Makefile.in index 04d6ded641..99994ff82d 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/Makefile.in +++ b/c/src/lib/libbsp/powerpc/papyrus/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 SRCS=README diff --git a/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in index 96e1f1f2c8..dc40c405f6 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in +++ b/c/src/lib/libbsp/powerpc/papyrus/dlentry/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 PGM=${ARCH}/dlentry.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in index 61c19ddff8..683f996472 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in +++ b/c/src/lib/libbsp/powerpc/papyrus/flashentry/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 PGM=${ARCH}/flashentry.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/libbsp/powerpc/papyrus/include/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in index 420847fddf..096f514e64 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in +++ b/c/src/lib/libbsp/powerpc/papyrus/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in index 8b8f805dd3..301eb2f6c6 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in index 4c8a766369..f5e4ac56c5 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/papyrus/wrapup/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 BSP_PIECES=startup dlentry flashentry # pieces to pick up out of libcpu/ppc @@ -23,7 +21,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/shmdr/Makefile.in b/c/src/lib/libbsp/shmdr/Makefile.in index b7cfd76e86..2518bf1737 100644 --- a/c/src/lib/libbsp/shmdr/Makefile.in +++ b/c/src/lib/libbsp/shmdr/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 PGM=${ARCH}/shmdr.rel @@ -24,7 +22,7 @@ H_FILES=$(H_PIECES:%=$(srcdir)/%.h) SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/sparc/Makefile.in b/c/src/lib/libbsp/sparc/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/sparc/Makefile.in +++ b/c/src/lib/libbsp/sparc/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.in b/c/src/lib/libbsp/sparc/erc32/Makefile.in index fcda66208a..857ba52e5d 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/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 # wrapup is the one that actually builds and installs the library diff --git a/c/src/lib/libbsp/sparc/erc32/clock/Makefile.in b/c/src/lib/libbsp/sparc/erc32/clock/Makefile.in index 34c6782b64..e40e10fb1a 100644 --- a/c/src/lib/libbsp/sparc/erc32/clock/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/clock/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 PGM=${ARCH}/clock.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/lib/libbsp/sparc/erc32/console/Makefile.in b/c/src/lib/libbsp/sparc/erc32/console/Makefile.in index 77caa485be..b73d23df40 100644 --- a/c/src/lib/libbsp/sparc/erc32/console/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/console/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 PGM=${ARCH}/console.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/lib/libbsp/sparc/erc32/include/Makefile.in b/c/src/lib/libbsp/sparc/erc32/include/Makefile.in index eb94bae8ce..93ed75d4a2 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -27,7 +25,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/sparc/erc32/start/Makefile.in b/c/src/lib/libbsp/sparc/erc32/start/Makefile.in index 7016c36d49..dbc9cea9e3 100644 --- a/c/src/lib/libbsp/sparc/erc32/start/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/start/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 PGMS=${ARCH}/startsis.o @@ -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/lib/libbsp/sparc/erc32/startsis/Makefile.in b/c/src/lib/libbsp/sparc/erc32/startsis/Makefile.in index 7016c36d49..dbc9cea9e3 100644 --- a/c/src/lib/libbsp/sparc/erc32/startsis/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/startsis/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 PGMS=${ARCH}/startsis.o @@ -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/lib/libbsp/sparc/erc32/startup/Makefile.in b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in index ae8798c96f..d2e036dae3 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/../../../shared -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg PGM=${ARCH}/startup.rel @@ -35,7 +33,7 @@ OBJS=$(C_O_FILES) # so it can be easily place correctly by the compiler config file. INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/sparc/erc32/timer/Makefile.in b/c/src/lib/libbsp/sparc/erc32/timer/Makefile.in index 86fba03a98..16665e4de9 100644 --- a/c/src/lib/libbsp/sparc/erc32/timer/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/timer/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 PGM=${ARCH}/timer.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/lib/libbsp/sparc/erc32/tools/Makefile.in b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in index afbca66581..97f24fac0a 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/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/leaf.cfg DESTDIR=$(PROJECT_RELEASE)/tests diff --git a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in index 5c4d2352bd..134655b109 100644 --- a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/wrapup/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 BSP_PIECES=startup console clock timer # pieces to pick up out of libcpu/sparc @@ -23,7 +21,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libbsp/unix/Makefile.in b/c/src/lib/libbsp/unix/Makefile.in index 847e62f97f..f049e9b2e8 100644 --- a/c/src/lib/libbsp/unix/Makefile.in +++ b/c/src/lib/libbsp/unix/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 # Descend into the $(RTEMS_BSP_FAMILY) directory diff --git a/c/src/lib/libbsp/unix/posix/Makefile.in b/c/src/lib/libbsp/unix/posix/Makefile.in index 4575270de3..2a6c7a1dca 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.in +++ b/c/src/lib/libbsp/unix/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 SRCS=README diff --git a/c/src/lib/libbsp/unix/posix/clock/Makefile.in b/c/src/lib/libbsp/unix/posix/clock/Makefile.in index c81b27ae5e..516b5900b1 100644 --- a/c/src/lib/libbsp/unix/posix/clock/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/clock/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 PGM=${ARCH}/clock.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/unix/posix/console/Makefile.in b/c/src/lib/libbsp/unix/posix/console/Makefile.in index 580c9e9c7d..fd05ddfedd 100644 --- a/c/src/lib/libbsp/unix/posix/console/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/console/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 PGM=${ARCH}/console.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/unix/posix/include/Makefile.in b/c/src/lib/libbsp/unix/posix/include/Makefile.in index 83a810f42b..7d8581095f 100644 --- a/c/src/lib/libbsp/unix/posix/include/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/include/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 = $(srcdir)/bsp.h $(srcdir)/coverhd.h @@ -24,7 +22,7 @@ EQ_FILES = SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in b/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in index 67789ddd09..8825079da7 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/shmsupp/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 PGM=${ARCH}/shmsupp.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/unix/posix/startup/Makefile.in b/c/src/lib/libbsp/unix/posix/startup/Makefile.in index aa8821a2ad..922b5940bf 100644 --- a/c/src/lib/libbsp/unix/posix/startup/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/startup/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 PGM=${ARCH}/startup.rel NO_CTOR_LIB=${ARCH}/libno-ctor.a @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) # so it can be easily place correctly by the compiler config file. INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/unix/posix/timer/Makefile.in b/c/src/lib/libbsp/unix/posix/timer/Makefile.in index 5712957f28..5901ba1f1b 100644 --- a/c/src/lib/libbsp/unix/posix/timer/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/timer/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 PGM=${ARCH}/timer.rel @@ -22,7 +20,7 @@ H_FILES= SRCS=$(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/lib/libbsp/unix/posix/tools/Makefile.in b/c/src/lib/libbsp/unix/posix/tools/Makefile.in index 65de917bd1..0fd219ab05 100644 --- a/c/src/lib/libbsp/unix/posix/tools/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/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/leaf.cfg DESTDIR=$(PROJECT_RELEASE)/tests diff --git a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in index 6e1a946f87..f2e05eeff6 100644 --- a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in +++ b/c/src/lib/libbsp/unix/posix/wrapup/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 # MP_XXX_PARTS are the pieces of the BSP required in a MP environment # We only build them if HAS_MP was defined @@ -34,7 +32,7 @@ OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ ../../../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libbsp.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/lib/libc/Makefile.in b/c/src/lib/libc/Makefile.in index cce8bd40ca..63fc59ca34 100644 --- a/c/src/lib/libc/Makefile.in +++ b/c/src/lib/libc/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 LIBNAME=libcsupport.a LIB=${ARCH}/${LIBNAME} @@ -29,7 +27,7 @@ INSTALLED_H_FILES=$(srcdir)/libio.h $(srcdir)/libcsupport.h SRCS=$(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(PRIVATE_H_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/lib/libcpu/Makefile.in b/c/src/lib/libcpu/Makefile.in index 56e4b0dfac..5c974036b3 100644 --- a/c/src/lib/libcpu/Makefile.in +++ b/c/src/lib/libcpu/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_CPU)) diff --git a/c/src/lib/libcpu/hppa1.1/Makefile.in b/c/src/lib/libcpu/hppa1.1/Makefile.in index 7aa3f9e982..278bc4ebe5 100644 --- a/c/src/lib/libcpu/hppa1.1/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/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=include milli runway clock timer semaphore diff --git a/c/src/lib/libcpu/hppa1.1/clock/Makefile.in b/c/src/lib/libcpu/hppa1.1/clock/Makefile.in index 60639524c2..7b299d4ef0 100644 --- a/c/src/lib/libcpu/hppa1.1/clock/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/clock/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 PGM=${ARCH}/clock.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/lib/libcpu/hppa1.1/include/Makefile.in b/c/src/lib/libcpu/hppa1.1/include/Makefile.in index 876a56d5f0..77ba3a4092 100644 --- a/c/src/lib/libcpu/hppa1.1/include/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/include/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 all: FORCEIT diff --git a/c/src/lib/libcpu/hppa1.1/milli/Makefile.in b/c/src/lib/libcpu/hppa1.1/milli/Makefile.in index abf6b7d466..52124d0a59 100644 --- a/c/src/lib/libcpu/hppa1.1/milli/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/milli/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 PGM=${ARCH}/milli.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/lib/libcpu/hppa1.1/runway/Makefile.in b/c/src/lib/libcpu/hppa1.1/runway/Makefile.in index 472f71a19c..30d2871ec6 100644 --- a/c/src/lib/libcpu/hppa1.1/runway/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/runway/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 H_PIECES = runway H_FILES=$(H_PIECES:%=$(srcdir)/%.h) SRCS=$(H_FILES) $(EQ_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in index 23a2178cb8..309e9a93af 100644 --- a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/semaphore/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 PGM=${ARCH}/semaphore.rel @@ -28,7 +26,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/lib/libcpu/hppa1.1/timer/Makefile.in b/c/src/lib/libcpu/hppa1.1/timer/Makefile.in index 2f089c4d3e..2c423f2a5a 100644 --- a/c/src/lib/libcpu/hppa1.1/timer/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/timer/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 PGM=${ARCH}/timer.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/lib/libcpu/m68k/Makefile.in b/c/src/lib/libcpu/m68k/Makefile.in index 11e13767c0..be2ceb4dee 100644 --- a/c/src/lib/libcpu/m68k/Makefile.in +++ b/c/src/lib/libcpu/m68k/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_CPU_MODEL)) diff --git a/c/src/lib/libcpu/m68k/m68040/Makefile.in b/c/src/lib/libcpu/m68k/m68040/Makefile.in index 4e25a8dc94..c173328542 100644 --- a/c/src/lib/libcpu/m68k/m68040/Makefile.in +++ b/c/src/lib/libcpu/m68k/m68040/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=fpsp diff --git a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.in b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.in index aa3359294a..961f004886 100644 --- a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.in +++ b/c/src/lib/libcpu/m68k/m68040/fpsp/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 PGM=${ARCH}/fpsp.rel @@ -31,7 +29,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/lib/libcpu/mips64orion/Makefile.in b/c/src/lib/libcpu/mips64orion/Makefile.in index 16ffa4d012..16fe4e3c14 100644 --- a/c/src/lib/libcpu/mips64orion/Makefile.in +++ b/c/src/lib/libcpu/mips64orion/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=include clock timer diff --git a/c/src/lib/libcpu/mips64orion/clock/Makefile.in b/c/src/lib/libcpu/mips64orion/clock/Makefile.in index 119ad5b7bf..229d5caec6 100644 --- a/c/src/lib/libcpu/mips64orion/clock/Makefile.in +++ b/c/src/lib/libcpu/mips64orion/clock/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 PGM=${ARCH}/clock.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/lib/libcpu/mips64orion/include/Makefile.in b/c/src/lib/libcpu/mips64orion/include/Makefile.in index fdc604929e..c89f2f52c8 100644 --- a/c/src/lib/libcpu/mips64orion/include/Makefile.in +++ b/c/src/lib/libcpu/mips64orion/include/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 all: FORCEIT diff --git a/c/src/lib/libcpu/mips64orion/timer/Makefile.in b/c/src/lib/libcpu/mips64orion/timer/Makefile.in index 81e39049b0..b919779ab4 100644 --- a/c/src/lib/libcpu/mips64orion/timer/Makefile.in +++ b/c/src/lib/libcpu/mips64orion/timer/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 PGM=${ARCH}/timer.rel @@ -29,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/leaf.cfg # diff --git a/c/src/lib/libcpu/powerpc/Makefile.in b/c/src/lib/libcpu/powerpc/Makefile.in index 11e13767c0..be2ceb4dee 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.in +++ b/c/src/lib/libcpu/powerpc/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_CPU_MODEL)) diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/Makefile.in index e36b922bce..f4490904c1 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.in +++ b/c/src/lib/libcpu/powerpc/ppc403/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=include console clock timer vectors diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.in index 60639524c2..7b299d4ef0 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.in +++ b/c/src/lib/libcpu/powerpc/ppc403/clock/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 PGM=${ARCH}/clock.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/lib/libcpu/powerpc/ppc403/console/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.in index 77caa485be..b73d23df40 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.in +++ b/c/src/lib/libcpu/powerpc/ppc403/console/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 PGM=${ARCH}/console.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/lib/libcpu/powerpc/ppc403/include/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/include/Makefile.in index 94f0f81b98..d735854532 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/include/Makefile.in +++ b/c/src/lib/libcpu/powerpc/ppc403/include/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 all: FORCEIT diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.in index 2f089c4d3e..2c423f2a5a 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.in +++ b/c/src/lib/libcpu/powerpc/ppc403/timer/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 PGM=${ARCH}/timer.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/lib/libcpu/powerpc/ppc403/vectors/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.in index 642118750a..4f07c4e13b 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.in +++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/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 PGM=${ARCH}/vectors.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/lib/libcpu/sparc/Makefile.in b/c/src/lib/libcpu/sparc/Makefile.in index ad6f7b1219..51795c3e3b 100644 --- a/c/src/lib/libcpu/sparc/Makefile.in +++ b/c/src/lib/libcpu/sparc/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=reg_win diff --git a/c/src/lib/libcpu/sparc/reg_win/Makefile.in b/c/src/lib/libcpu/sparc/reg_win/Makefile.in index d7cb1011e3..5fea203cfb 100644 --- a/c/src/lib/libcpu/sparc/reg_win/Makefile.in +++ b/c/src/lib/libcpu/sparc/reg_win/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 PGM=${ARCH}/reg_win.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/lib/libmisc/Makefile.in b/c/src/lib/libmisc/Makefile.in index 4de9a14c81..694266ae07 100644 --- a/c/src/lib/libmisc/Makefile.in +++ b/c/src/lib/libmisc/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=assoc error stackchk monitor cpuuse rtmonuse wrapup diff --git a/c/src/lib/libmisc/assoc/Makefile.in b/c/src/lib/libmisc/assoc/Makefile.in index 695cff0e3a..a547bb6565 100644 --- a/c/src/lib/libmisc/assoc/Makefile.in +++ b/c/src/lib/libmisc/assoc/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 LIB=${ARCH}/libassoc-tmp.a @@ -22,7 +20,7 @@ H_FILES=$(srcdir)/assoc.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/lib/libmisc/cpuuse/Makefile.in b/c/src/lib/libmisc/cpuuse/Makefile.in index fc8cc583a4..391b6cac8f 100644 --- a/c/src/lib/libmisc/cpuuse/Makefile.in +++ b/c/src/lib/libmisc/cpuuse/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 LIB=${ARCH}/libcpuuse-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/cpuuse.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/lib/libmisc/error/Makefile.in b/c/src/lib/libmisc/error/Makefile.in index 613ca85784..5cc51de586 100644 --- a/c/src/lib/libmisc/error/Makefile.in +++ b/c/src/lib/libmisc/error/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 LIB=${ARCH}/liberror-tmp.a @@ -22,7 +20,7 @@ H_FILES=$(srcdir)/error.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/lib/libmisc/monitor/Makefile.in b/c/src/lib/libmisc/monitor/Makefile.in index c327df7fe8..1ed5d13cb1 100644 --- a/c/src/lib/libmisc/monitor/Makefile.in +++ b/c/src/lib/libmisc/monitor/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 LIB=${ARCH}/libmonitor-tmp.a # C source names, if any, go here -- minus the .c @@ -24,7 +22,7 @@ INSTALLED_H_FILES=$(srcdir)/monitor.h $(srcdir)/symbols.h SRCS=README $(C_FILES) $(H_FILES) $(INSTALLED_H_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/lib/libmisc/rtmonuse/Makefile.in b/c/src/lib/libmisc/rtmonuse/Makefile.in index 87d68c9ed1..a344c894b6 100644 --- a/c/src/lib/libmisc/rtmonuse/Makefile.in +++ b/c/src/lib/libmisc/rtmonuse/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 LIB=${ARCH}/librtmonuse-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/rtmonuse.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/lib/libmisc/stackchk/Makefile.in b/c/src/lib/libmisc/stackchk/Makefile.in index e262e27b81..2708e825bc 100644 --- a/c/src/lib/libmisc/stackchk/Makefile.in +++ b/c/src/lib/libmisc/stackchk/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 LIB=${ARCH}/libstackchk-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/stackchk.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/lib/libmisc/wrapup/Makefile.in b/c/src/lib/libmisc/wrapup/Makefile.in index 7d8b43535a..6a78cf222a 100644 --- a/c/src/lib/libmisc/wrapup/Makefile.in +++ b/c/src/lib/libmisc/wrapup/Makefile.in @@ -4,15 +4,13 @@ @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 LIB=$(ARCH)/libmisc.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # Using the wildcard on the Purify support makes sure it may not be there diff --git a/c/src/lib/librtems++/Makefile.in b/c/src/lib/librtems++/Makefile.in index 0e1903d461..c69c34790a 100644 --- a/c/src/lib/librtems++/Makefile.in +++ b/c/src/lib/librtems++/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 LIBNAME=librtems++.a LIB=${ARCH}/${LIBNAME} @@ -22,7 +20,7 @@ CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o) SRCS=$(CC_FILES) OBJS=$(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/lib/start/Makefile.in b/c/src/lib/start/Makefile.in index 56e4b0dfac..5c974036b3 100644 --- a/c/src/lib/start/Makefile.in +++ b/c/src/lib/start/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_CPU)) diff --git a/c/src/lib/start/a29k/Makefile.in b/c/src/lib/start/a29k/Makefile.in index 9957ff775d..f89c5a7e6f 100644 --- a/c/src/lib/start/a29k/Makefile.in +++ b/c/src/lib/start/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 # C source names, if any, go here -- minus the .c C_PIECES= @@ -25,7 +23,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 PGM=${ARCH}/crt0.o ${ARCH}/register.o diff --git a/c/src/lib/start/i960/Makefile.in b/c/src/lib/start/i960/Makefile.in index e726972629..68dcd2196e 100644 --- a/c/src/lib/start/i960/Makefile.in +++ b/c/src/lib/start/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 # C source names, if any, go here -- minus the .c C_PIECES= @@ -25,7 +23,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_O_FILES) $(S_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg PGM=${ARCH}/start.o diff --git a/c/src/lib/start/m68k/Makefile.in b/c/src/lib/start/m68k/Makefile.in index 1c07109976..bafd65a3ff 100644 --- a/c/src/lib/start/m68k/Makefile.in +++ b/c/src/lib/start/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 PGMS=${ARCH}/start.o @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(C_FILES) $(H_FILES) $(S_FILES) OBJS=$(C_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/lib/start/mips64orion/Makefile.in b/c/src/lib/start/mips64orion/Makefile.in index 7e78dfb2b1..046969120a 100644 --- a/c/src/lib/start/mips64orion/Makefile.in +++ b/c/src/lib/start/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 # C source names, if any, go here -- minus the .c C_PIECES= @@ -25,7 +23,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 PGM=${ARCH}/idt_csu.o diff --git a/c/src/lib/wrapup/Makefile.in b/c/src/lib/wrapup/Makefile.in index 649d0ed2a4..46f7aac927 100644 --- a/c/src/lib/wrapup/Makefile.in +++ b/c/src/lib/wrapup/Makefile.in @@ -6,13 +6,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/lib.cfg LIB=$(PROJECT_RELEASE)/lib/librtemsall.a diff --git a/c/src/libmisc/assoc/Makefile.in b/c/src/libmisc/assoc/Makefile.in index 695cff0e3a..a547bb6565 100644 --- a/c/src/libmisc/assoc/Makefile.in +++ b/c/src/libmisc/assoc/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 LIB=${ARCH}/libassoc-tmp.a @@ -22,7 +20,7 @@ H_FILES=$(srcdir)/assoc.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/libmisc/cpuuse/Makefile.in b/c/src/libmisc/cpuuse/Makefile.in index fc8cc583a4..391b6cac8f 100644 --- a/c/src/libmisc/cpuuse/Makefile.in +++ b/c/src/libmisc/cpuuse/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 LIB=${ARCH}/libcpuuse-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/cpuuse.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/libmisc/error/Makefile.in b/c/src/libmisc/error/Makefile.in index 613ca85784..5cc51de586 100644 --- a/c/src/libmisc/error/Makefile.in +++ b/c/src/libmisc/error/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 LIB=${ARCH}/liberror-tmp.a @@ -22,7 +20,7 @@ H_FILES=$(srcdir)/error.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/libmisc/monitor/Makefile.in b/c/src/libmisc/monitor/Makefile.in index c327df7fe8..1ed5d13cb1 100644 --- a/c/src/libmisc/monitor/Makefile.in +++ b/c/src/libmisc/monitor/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 LIB=${ARCH}/libmonitor-tmp.a # C source names, if any, go here -- minus the .c @@ -24,7 +22,7 @@ INSTALLED_H_FILES=$(srcdir)/monitor.h $(srcdir)/symbols.h SRCS=README $(C_FILES) $(H_FILES) $(INSTALLED_H_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/libmisc/rtmonuse/Makefile.in b/c/src/libmisc/rtmonuse/Makefile.in index 87d68c9ed1..a344c894b6 100644 --- a/c/src/libmisc/rtmonuse/Makefile.in +++ b/c/src/libmisc/rtmonuse/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 LIB=${ARCH}/librtmonuse-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/rtmonuse.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/libmisc/stackchk/Makefile.in b/c/src/libmisc/stackchk/Makefile.in index e262e27b81..2708e825bc 100644 --- a/c/src/libmisc/stackchk/Makefile.in +++ b/c/src/libmisc/stackchk/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 LIB=${ARCH}/libstackchk-tmp.a @@ -23,7 +21,7 @@ INSTALLED_H_FILES=$(srcdir)/stackchk.h SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_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/libmisc/wrapup/Makefile.in b/c/src/libmisc/wrapup/Makefile.in index 7d8b43535a..6a78cf222a 100644 --- a/c/src/libmisc/wrapup/Makefile.in +++ b/c/src/libmisc/wrapup/Makefile.in @@ -4,15 +4,13 @@ @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 LIB=$(ARCH)/libmisc.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # Using the wildcard on the Purify support makes sure it may not be there diff --git a/c/src/librtems++/src/Makefile.in b/c/src/librtems++/src/Makefile.in index 0e1903d461..c69c34790a 100644 --- a/c/src/librtems++/src/Makefile.in +++ b/c/src/librtems++/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 LIBNAME=librtems++.a LIB=${ARCH}/${LIBNAME} @@ -22,7 +20,7 @@ CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o) SRCS=$(CC_FILES) OBJS=$(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/tests/Makefile.in b/c/src/tests/Makefile.in index d8e412844c..7eb4494b34 100644 --- a/c/src/tests/Makefile.in +++ b/c/src/tests/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 all: README diff --git a/c/src/tests/libtests/Makefile.in b/c/src/tests/libtests/Makefile.in index 4c6694ddde..004100a86e 100644 --- a/c/src/tests/libtests/Makefile.in +++ b/c/src/tests/libtests/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 # We only build the tests for the rtems++ library if HAS_CPLUSPLUS was defined diff --git a/c/src/tests/libtests/cpuuse/Makefile.in b/c/src/tests/libtests/cpuuse/Makefile.in index 8e1644e522..22ef7819d2 100644 --- a/c/src/tests/libtests/cpuuse/Makefile.in +++ b/c/src/tests/libtests/cpuuse/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 TEST=cpuuse @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/libtests/malloctest/Makefile.in b/c/src/tests/libtests/malloctest/Makefile.in index 1a49c20da2..ca7c4cb1f6 100644 --- a/c/src/tests/libtests/malloctest/Makefile.in +++ b/c/src/tests/libtests/malloctest/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 TEST=malloctest @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/libtests/monitor/Makefile.in b/c/src/tests/libtests/monitor/Makefile.in index c93f2f4647..e264fe9f9b 100644 --- a/c/src/tests/libtests/monitor/Makefile.in +++ b/c/src/tests/libtests/monitor/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 TEST=monitor @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/libtests/rtems++/Makefile.in b/c/src/tests/libtests/rtems++/Makefile.in index 69ffdd8d80..f909b618b9 100644 --- a/c/src/tests/libtests/rtems++/Makefile.in +++ b/c/src/tests/libtests/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 TEST=rtems++ @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/libtests/rtmonuse/Makefile.in b/c/src/tests/libtests/rtmonuse/Makefile.in index 37874ff3c0..9c9ea2e366 100644 --- a/c/src/tests/libtests/rtmonuse/Makefile.in +++ b/c/src/tests/libtests/rtmonuse/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 TEST=rtmonuse @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/libtests/stackchk/Makefile.in b/c/src/tests/libtests/stackchk/Makefile.in index 1c88e6f604..462f83fb6c 100644 --- a/c/src/tests/libtests/stackchk/Makefile.in +++ b/c/src/tests/libtests/stackchk/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 TEST=stackchk @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/libtests/termios/Makefile.in b/c/src/tests/libtests/termios/Makefile.in index d8eebfd8e6..c575570f9e 100644 --- a/c/src/tests/libtests/termios/Makefile.in +++ b/c/src/tests/libtests/termios/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 SAMPLE=termios PGM=${ARCH}/$(SAMPLE).exe @@ -32,7 +30,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(SAMPLE).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/Makefile.in b/c/src/tests/mptests/Makefile.in index bde186b7d3..aa1c166788 100644 --- a/c/src/tests/mptests/Makefile.in +++ b/c/src/tests/mptests/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 all: README diff --git a/c/src/tests/mptests/mp01/Makefile.in b/c/src/tests/mptests/mp01/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp01/Makefile.in +++ b/c/src/tests/mptests/mp01/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=node1 node2 diff --git a/c/src/tests/mptests/mp01/node1/Makefile.in b/c/src/tests/mptests/mp01/node1/Makefile.in index cd74337444..3573ffbdf3 100644 --- a/c/src/tests/mptests/mp01/node1/Makefile.in +++ b/c/src/tests/mptests/mp01/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp01 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp01/node2/Makefile.in b/c/src/tests/mptests/mp01/node2/Makefile.in index b3c7f8e576..33a7c559ba 100644 --- a/c/src/tests/mptests/mp01/node2/Makefile.in +++ b/c/src/tests/mptests/mp01/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp01 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp02/Makefile.in b/c/src/tests/mptests/mp02/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp02/Makefile.in +++ b/c/src/tests/mptests/mp02/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=node1 node2 diff --git a/c/src/tests/mptests/mp02/node1/Makefile.in b/c/src/tests/mptests/mp02/node1/Makefile.in index 8988365eb3..fa102f135e 100644 --- a/c/src/tests/mptests/mp02/node1/Makefile.in +++ b/c/src/tests/mptests/mp02/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp02 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp02/node2/Makefile.in b/c/src/tests/mptests/mp02/node2/Makefile.in index 1df41f8bdc..ed3c8218a3 100644 --- a/c/src/tests/mptests/mp02/node2/Makefile.in +++ b/c/src/tests/mptests/mp02/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp02 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp03/Makefile.in b/c/src/tests/mptests/mp03/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp03/Makefile.in +++ b/c/src/tests/mptests/mp03/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=node1 node2 diff --git a/c/src/tests/mptests/mp03/node1/Makefile.in b/c/src/tests/mptests/mp03/node1/Makefile.in index ca36c384d4..fb171d0d8a 100644 --- a/c/src/tests/mptests/mp03/node1/Makefile.in +++ b/c/src/tests/mptests/mp03/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp03 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp03/node2/Makefile.in b/c/src/tests/mptests/mp03/node2/Makefile.in index 1d4e1436b5..c88e09a297 100644 --- a/c/src/tests/mptests/mp03/node2/Makefile.in +++ b/c/src/tests/mptests/mp03/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp03 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp04/Makefile.in b/c/src/tests/mptests/mp04/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp04/Makefile.in +++ b/c/src/tests/mptests/mp04/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=node1 node2 diff --git a/c/src/tests/mptests/mp04/node1/Makefile.in b/c/src/tests/mptests/mp04/node1/Makefile.in index 3923f48842..7bb1301ebc 100644 --- a/c/src/tests/mptests/mp04/node1/Makefile.in +++ b/c/src/tests/mptests/mp04/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp04 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp04/node2/Makefile.in b/c/src/tests/mptests/mp04/node2/Makefile.in index be31d52d46..ca4efd0c26 100644 --- a/c/src/tests/mptests/mp04/node2/Makefile.in +++ b/c/src/tests/mptests/mp04/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp04 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp05/Makefile.in b/c/src/tests/mptests/mp05/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp05/Makefile.in +++ b/c/src/tests/mptests/mp05/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=node1 node2 diff --git a/c/src/tests/mptests/mp05/node1/Makefile.in b/c/src/tests/mptests/mp05/node1/Makefile.in index 7820014fd7..ff8fdcb7f7 100644 --- a/c/src/tests/mptests/mp05/node1/Makefile.in +++ b/c/src/tests/mptests/mp05/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp05 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp05/node2/Makefile.in b/c/src/tests/mptests/mp05/node2/Makefile.in index a8f903f159..81efd27b68 100644 --- a/c/src/tests/mptests/mp05/node2/Makefile.in +++ b/c/src/tests/mptests/mp05/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp05 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp06/Makefile.in b/c/src/tests/mptests/mp06/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp06/Makefile.in +++ b/c/src/tests/mptests/mp06/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=node1 node2 diff --git a/c/src/tests/mptests/mp06/node1/Makefile.in b/c/src/tests/mptests/mp06/node1/Makefile.in index b574c8fc6e..80628ebbb4 100644 --- a/c/src/tests/mptests/mp06/node1/Makefile.in +++ b/c/src/tests/mptests/mp06/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp06 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp06/node2/Makefile.in b/c/src/tests/mptests/mp06/node2/Makefile.in index 28c18c998b..ed9908f70c 100644 --- a/c/src/tests/mptests/mp06/node2/Makefile.in +++ b/c/src/tests/mptests/mp06/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp06 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp07/Makefile.in b/c/src/tests/mptests/mp07/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp07/Makefile.in +++ b/c/src/tests/mptests/mp07/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=node1 node2 diff --git a/c/src/tests/mptests/mp07/node1/Makefile.in b/c/src/tests/mptests/mp07/node1/Makefile.in index bec276e248..8344b15c0e 100644 --- a/c/src/tests/mptests/mp07/node1/Makefile.in +++ b/c/src/tests/mptests/mp07/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp07 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp07/node2/Makefile.in b/c/src/tests/mptests/mp07/node2/Makefile.in index 394b1866b5..de4f73678d 100644 --- a/c/src/tests/mptests/mp07/node2/Makefile.in +++ b/c/src/tests/mptests/mp07/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp07 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp08/Makefile.in b/c/src/tests/mptests/mp08/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp08/Makefile.in +++ b/c/src/tests/mptests/mp08/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=node1 node2 diff --git a/c/src/tests/mptests/mp08/node1/Makefile.in b/c/src/tests/mptests/mp08/node1/Makefile.in index 74744d29ad..b87baa7e1c 100644 --- a/c/src/tests/mptests/mp08/node1/Makefile.in +++ b/c/src/tests/mptests/mp08/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp08 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp08/node2/Makefile.in b/c/src/tests/mptests/mp08/node2/Makefile.in index 23b8bfb6d3..f5fc63b7d9 100644 --- a/c/src/tests/mptests/mp08/node2/Makefile.in +++ b/c/src/tests/mptests/mp08/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp08 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp09/Makefile.in b/c/src/tests/mptests/mp09/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp09/Makefile.in +++ b/c/src/tests/mptests/mp09/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=node1 node2 diff --git a/c/src/tests/mptests/mp09/node1/Makefile.in b/c/src/tests/mptests/mp09/node1/Makefile.in index 92d682008e..917530d146 100644 --- a/c/src/tests/mptests/mp09/node1/Makefile.in +++ b/c/src/tests/mptests/mp09/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp09 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp09/node2/Makefile.in b/c/src/tests/mptests/mp09/node2/Makefile.in index 5099a42253..ff9bba00dd 100644 --- a/c/src/tests/mptests/mp09/node2/Makefile.in +++ b/c/src/tests/mptests/mp09/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp09 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp10/Makefile.in b/c/src/tests/mptests/mp10/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp10/Makefile.in +++ b/c/src/tests/mptests/mp10/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=node1 node2 diff --git a/c/src/tests/mptests/mp10/node1/Makefile.in b/c/src/tests/mptests/mp10/node1/Makefile.in index ac7d2a1cee..c1d24ea13a 100644 --- a/c/src/tests/mptests/mp10/node1/Makefile.in +++ b/c/src/tests/mptests/mp10/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp10 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp10/node2/Makefile.in b/c/src/tests/mptests/mp10/node2/Makefile.in index 1c0f461c4c..bb8f49d980 100644 --- a/c/src/tests/mptests/mp10/node2/Makefile.in +++ b/c/src/tests/mptests/mp10/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp10 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp11/Makefile.in b/c/src/tests/mptests/mp11/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp11/Makefile.in +++ b/c/src/tests/mptests/mp11/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=node1 node2 diff --git a/c/src/tests/mptests/mp11/node1/Makefile.in b/c/src/tests/mptests/mp11/node1/Makefile.in index c440b739b3..ea6c2a2a81 100644 --- a/c/src/tests/mptests/mp11/node1/Makefile.in +++ b/c/src/tests/mptests/mp11/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp11 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp11/node2/Makefile.in b/c/src/tests/mptests/mp11/node2/Makefile.in index f56f3f1265..0073e6f1d9 100644 --- a/c/src/tests/mptests/mp11/node2/Makefile.in +++ b/c/src/tests/mptests/mp11/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp11 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp12/Makefile.in b/c/src/tests/mptests/mp12/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp12/Makefile.in +++ b/c/src/tests/mptests/mp12/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=node1 node2 diff --git a/c/src/tests/mptests/mp12/node1/Makefile.in b/c/src/tests/mptests/mp12/node1/Makefile.in index 27f53e8c8a..717cb67576 100644 --- a/c/src/tests/mptests/mp12/node1/Makefile.in +++ b/c/src/tests/mptests/mp12/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp12 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp12/node2/Makefile.in b/c/src/tests/mptests/mp12/node2/Makefile.in index c5673c4079..3d5865c98f 100644 --- a/c/src/tests/mptests/mp12/node2/Makefile.in +++ b/c/src/tests/mptests/mp12/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp12 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp13/Makefile.in b/c/src/tests/mptests/mp13/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp13/Makefile.in +++ b/c/src/tests/mptests/mp13/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=node1 node2 diff --git a/c/src/tests/mptests/mp13/node1/Makefile.in b/c/src/tests/mptests/mp13/node1/Makefile.in index 3df5360ef9..6cf55facc8 100644 --- a/c/src/tests/mptests/mp13/node1/Makefile.in +++ b/c/src/tests/mptests/mp13/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp13 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp13/node2/Makefile.in b/c/src/tests/mptests/mp13/node2/Makefile.in index 6b7100144b..fa5b35cb79 100644 --- a/c/src/tests/mptests/mp13/node2/Makefile.in +++ b/c/src/tests/mptests/mp13/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp13 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp14/Makefile.in b/c/src/tests/mptests/mp14/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/mptests/mp14/Makefile.in +++ b/c/src/tests/mptests/mp14/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=node1 node2 diff --git a/c/src/tests/mptests/mp14/node1/Makefile.in b/c/src/tests/mptests/mp14/node1/Makefile.in index 96a5cb9e0d..4129e7d526 100644 --- a/c/src/tests/mptests/mp14/node1/Makefile.in +++ b/c/src/tests/mptests/mp14/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 TEST=mp14 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/mptests/mp14/node2/Makefile.in b/c/src/tests/mptests/mp14/node2/Makefile.in index de5af31571..6ebe8cba4b 100644 --- a/c/src/tests/mptests/mp14/node2/Makefile.in +++ b/c/src/tests/mptests/mp14/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 TEST=mp14 @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/Makefile.in b/c/src/tests/psxtests/Makefile.in index 873241995d..87c597ebbd 100644 --- a/c/src/tests/psxtests/Makefile.in +++ b/c/src/tests/psxtests/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=support psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \ diff --git a/c/src/tests/psxtests/psx01/Makefile.in b/c/src/tests/psxtests/psx01/Makefile.in index 98a627112d..e6508310f7 100644 --- a/c/src/tests/psxtests/psx01/Makefile.in +++ b/c/src/tests/psxtests/psx01/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 TEST=psx01 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx02/Makefile.in b/c/src/tests/psxtests/psx02/Makefile.in index d6445390b1..4f8d77c334 100644 --- a/c/src/tests/psxtests/psx02/Makefile.in +++ b/c/src/tests/psxtests/psx02/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 TEST=psx02 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx03/Makefile.in b/c/src/tests/psxtests/psx03/Makefile.in index 63f3e19922..c3d0ef7fba 100644 --- a/c/src/tests/psxtests/psx03/Makefile.in +++ b/c/src/tests/psxtests/psx03/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 TEST=psx03 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx04/Makefile.in b/c/src/tests/psxtests/psx04/Makefile.in index ec021f32cd..92aff63d8a 100644 --- a/c/src/tests/psxtests/psx04/Makefile.in +++ b/c/src/tests/psxtests/psx04/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 TEST=psx04 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx05/Makefile.in b/c/src/tests/psxtests/psx05/Makefile.in index 5562353f4f..af3157e227 100644 --- a/c/src/tests/psxtests/psx05/Makefile.in +++ b/c/src/tests/psxtests/psx05/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 TEST=psx05 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx06/Makefile.in b/c/src/tests/psxtests/psx06/Makefile.in index 5c9e202fd4..578fbeffd7 100644 --- a/c/src/tests/psxtests/psx06/Makefile.in +++ b/c/src/tests/psxtests/psx06/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 TEST=psx06 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx07/Makefile.in b/c/src/tests/psxtests/psx07/Makefile.in index 52d5ae9f51..10f3b00851 100644 --- a/c/src/tests/psxtests/psx07/Makefile.in +++ b/c/src/tests/psxtests/psx07/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 TEST=psx07 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx08/Makefile.in b/c/src/tests/psxtests/psx08/Makefile.in index c68741d263..3eba288f92 100644 --- a/c/src/tests/psxtests/psx08/Makefile.in +++ b/c/src/tests/psxtests/psx08/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 TEST=psx08 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx09/Makefile.in b/c/src/tests/psxtests/psx09/Makefile.in index eb22d91586..09eadef72d 100644 --- a/c/src/tests/psxtests/psx09/Makefile.in +++ b/c/src/tests/psxtests/psx09/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 TEST=psx09 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx10/Makefile.in b/c/src/tests/psxtests/psx10/Makefile.in index 171a54af66..a65b61bbd8 100644 --- a/c/src/tests/psxtests/psx10/Makefile.in +++ b/c/src/tests/psxtests/psx10/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 TEST=psx10 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx11/Makefile.in b/c/src/tests/psxtests/psx11/Makefile.in index 585524e734..96881f8a2b 100644 --- a/c/src/tests/psxtests/psx11/Makefile.in +++ b/c/src/tests/psxtests/psx11/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 TEST=psx11 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psx12/Makefile.in b/c/src/tests/psxtests/psx12/Makefile.in index a353a5e9b2..f2ea2915bb 100644 --- a/c/src/tests/psxtests/psx12/Makefile.in +++ b/c/src/tests/psxtests/psx12/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 TEST=psx12 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/psxtests/psxhdrs/Makefile.in b/c/src/tests/psxtests/psxhdrs/Makefile.in index 47c8809033..a47ffccb4f 100644 --- a/c/src/tests/psxtests/psxhdrs/Makefile.in +++ b/c/src/tests/psxtests/psxhdrs/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 source names, if any, go here -- minus the C_PIECES=\ @@ -45,7 +43,7 @@ SRCS=$(C_FILES) $(H_FILES) SRCS=$(C_FILES) $(H_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/tests/psxtests/support/Makefile.in b/c/src/tests/psxtests/support/Makefile.in index 9c6e125e21..c6e08f919c 100644 --- a/c/src/tests/psxtests/support/Makefile.in +++ b/c/src/tests/psxtests/support/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 all: diff --git a/c/src/tests/psxtests/support/include/Makefile.in b/c/src/tests/psxtests/support/include/Makefile.in index 6dc66125be..bf79747aff 100644 --- a/c/src/tests/psxtests/support/include/Makefile.in +++ b/c/src/tests/psxtests/support/include/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= $(srcdir)/pmacros.h @@ -16,7 +14,7 @@ SYS_H_FILES= SRCS=$(H_FILES) $(SYS_H_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/tests/samples/Makefile.in b/c/src/tests/samples/Makefile.in index f492c8922a..f5541f2df6 100644 --- a/c/src/tests/samples/Makefile.in +++ b/c/src/tests/samples/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 # cdtest is a C++ constructor/destructor test diff --git a/c/src/tests/samples/base_mp/Makefile.in b/c/src/tests/samples/base_mp/Makefile.in index 6eb6205261..9090167761 100644 --- a/c/src/tests/samples/base_mp/Makefile.in +++ b/c/src/tests/samples/base_mp/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=node1 node2 diff --git a/c/src/tests/samples/base_mp/node1/Makefile.in b/c/src/tests/samples/base_mp/node1/Makefile.in index a24a720a4a..c0f6a761b5 100644 --- a/c/src/tests/samples/base_mp/node1/Makefile.in +++ b/c/src/tests/samples/base_mp/node1/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=1 SAMPLE=base_mp @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/samples/base_mp/node2/Makefile.in b/c/src/tests/samples/base_mp/node2/Makefile.in index 23347b7095..67c98aeeef 100644 --- a/c/src/tests/samples/base_mp/node2/Makefile.in +++ b/c/src/tests/samples/base_mp/node2/Makefile.in @@ -4,11 +4,9 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @RTEMS_ROOT@ +RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg NODE=2 SAMPLE=base_mp @@ -31,7 +29,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/samples/base_sp/Makefile.in b/c/src/tests/samples/base_sp/Makefile.in index bd19650a44..50630816f4 100644 --- a/c/src/tests/samples/base_sp/Makefile.in +++ b/c/src/tests/samples/base_sp/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 SAMPLE=base_sp PGM=${ARCH}/$(SAMPLE).exe @@ -30,7 +28,7 @@ OBJS=$(C_O_FILES) PRINT_SRCS=$(DOCS) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/samples/cdtest/Makefile.in b/c/src/tests/samples/cdtest/Makefile.in index 3a9408321c..f8619da48c 100644 --- a/c/src/tests/samples/cdtest/Makefile.in +++ b/c/src/tests/samples/cdtest/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 SAMPLE=cdtest PGM=${ARCH}/$(SAMPLE).exe @@ -36,7 +34,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(SAMPLE).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/samples/hello/Makefile.in b/c/src/tests/samples/hello/Makefile.in index 3fbe2f3a10..f556dd49e3 100644 --- a/c/src/tests/samples/hello/Makefile.in +++ b/c/src/tests/samples/hello/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 SAMPLE=hello PGM=${ARCH}/$(SAMPLE).exe @@ -32,7 +30,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(SAMPLE).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/samples/paranoia/Makefile.in b/c/src/tests/samples/paranoia/Makefile.in index c9db316e3d..907d4aeefe 100644 --- a/c/src/tests/samples/paranoia/Makefile.in +++ b/c/src/tests/samples/paranoia/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 SAMPLE=paranoia PGM=${ARCH}/$(SAMPLE).exe @@ -32,7 +30,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(SAMPLE).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/samples/ticker/Makefile.in b/c/src/tests/samples/ticker/Makefile.in index 8f50720c96..2a37a918a9 100644 --- a/c/src/tests/samples/ticker/Makefile.in +++ b/c/src/tests/samples/ticker/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 SAMPLE=ticker PGM=${ARCH}/$(SAMPLE).exe @@ -32,7 +30,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(SAMPLE).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/Makefile.in b/c/src/tests/sptests/Makefile.in index f4587817d1..618b080d54 100644 --- a/c/src/tests/sptests/Makefile.in +++ b/c/src/tests/sptests/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 all: README diff --git a/c/src/tests/sptests/sp01/Makefile.in b/c/src/tests/sptests/sp01/Makefile.in index d71d847e2b..82f9a0292c 100644 --- a/c/src/tests/sptests/sp01/Makefile.in +++ b/c/src/tests/sptests/sp01/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 TEST=sp01 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp02/Makefile.in b/c/src/tests/sptests/sp02/Makefile.in index bf726e5146..c575cc532b 100644 --- a/c/src/tests/sptests/sp02/Makefile.in +++ b/c/src/tests/sptests/sp02/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 TEST=sp02 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp03/Makefile.in b/c/src/tests/sptests/sp03/Makefile.in index 60f9713007..aff787ea30 100644 --- a/c/src/tests/sptests/sp03/Makefile.in +++ b/c/src/tests/sptests/sp03/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 TEST=sp03 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp04/Makefile.in b/c/src/tests/sptests/sp04/Makefile.in index 78a8eac318..381b5bd73a 100644 --- a/c/src/tests/sptests/sp04/Makefile.in +++ b/c/src/tests/sptests/sp04/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 TEST=sp04 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp05/Makefile.in b/c/src/tests/sptests/sp05/Makefile.in index 9d6c575e92..f3cc475d57 100644 --- a/c/src/tests/sptests/sp05/Makefile.in +++ b/c/src/tests/sptests/sp05/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 TEST=sp05 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp06/Makefile.in b/c/src/tests/sptests/sp06/Makefile.in index 824e266746..149767ba11 100644 --- a/c/src/tests/sptests/sp06/Makefile.in +++ b/c/src/tests/sptests/sp06/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 TEST=sp06 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp07/Makefile.in b/c/src/tests/sptests/sp07/Makefile.in index c88af2d1a5..bd56649dd7 100644 --- a/c/src/tests/sptests/sp07/Makefile.in +++ b/c/src/tests/sptests/sp07/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 TEST=sp07 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp08/Makefile.in b/c/src/tests/sptests/sp08/Makefile.in index 72e808e355..3f77248cc8 100644 --- a/c/src/tests/sptests/sp08/Makefile.in +++ b/c/src/tests/sptests/sp08/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 TEST=sp08 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp09/Makefile.in b/c/src/tests/sptests/sp09/Makefile.in index 95b6f1034f..67da5d97bd 100644 --- a/c/src/tests/sptests/sp09/Makefile.in +++ b/c/src/tests/sptests/sp09/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 TEST=sp09 @@ -34,7 +32,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp11/Makefile.in b/c/src/tests/sptests/sp11/Makefile.in index 2acc4f826b..6d1eca6b35 100644 --- a/c/src/tests/sptests/sp11/Makefile.in +++ b/c/src/tests/sptests/sp11/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 TEST=sp11 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp12/Makefile.in b/c/src/tests/sptests/sp12/Makefile.in index 9a89a93f8f..b472a94841 100644 --- a/c/src/tests/sptests/sp12/Makefile.in +++ b/c/src/tests/sptests/sp12/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 TEST=sp12 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp13/Makefile.in b/c/src/tests/sptests/sp13/Makefile.in index 0814bda3c1..2bee0da020 100644 --- a/c/src/tests/sptests/sp13/Makefile.in +++ b/c/src/tests/sptests/sp13/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 TEST=sp13 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp14/Makefile.in b/c/src/tests/sptests/sp14/Makefile.in index 5a6951d69b..486c2ebc63 100644 --- a/c/src/tests/sptests/sp14/Makefile.in +++ b/c/src/tests/sptests/sp14/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 TEST=sp14 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp15/Makefile.in b/c/src/tests/sptests/sp15/Makefile.in index 8ea428b52b..8bc3f93e5c 100644 --- a/c/src/tests/sptests/sp15/Makefile.in +++ b/c/src/tests/sptests/sp15/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 TEST=sp15 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp16/Makefile.in b/c/src/tests/sptests/sp16/Makefile.in index d60f69c9f1..f818b5a041 100644 --- a/c/src/tests/sptests/sp16/Makefile.in +++ b/c/src/tests/sptests/sp16/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 TEST=sp16 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp17/Makefile.in b/c/src/tests/sptests/sp17/Makefile.in index f449c23803..c76375ccab 100644 --- a/c/src/tests/sptests/sp17/Makefile.in +++ b/c/src/tests/sptests/sp17/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 TEST=sp17 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp19/Makefile.in b/c/src/tests/sptests/sp19/Makefile.in index 8e1ed7e7ba..606ab65d14 100644 --- a/c/src/tests/sptests/sp19/Makefile.in +++ b/c/src/tests/sptests/sp19/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 TEST=sp19 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp20/Makefile.in b/c/src/tests/sptests/sp20/Makefile.in index 0e993882bb..eb60bc8930 100644 --- a/c/src/tests/sptests/sp20/Makefile.in +++ b/c/src/tests/sptests/sp20/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 TEST=sp20 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp21/Makefile.in b/c/src/tests/sptests/sp21/Makefile.in index 560a2b3f95..c871405e79 100644 --- a/c/src/tests/sptests/sp21/Makefile.in +++ b/c/src/tests/sptests/sp21/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 TEST=sp21 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp22/Makefile.in b/c/src/tests/sptests/sp22/Makefile.in index 1182298461..a53f032e32 100644 --- a/c/src/tests/sptests/sp22/Makefile.in +++ b/c/src/tests/sptests/sp22/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 TEST=sp22 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp23/Makefile.in b/c/src/tests/sptests/sp23/Makefile.in index d1211088a7..b8d5dc89f0 100644 --- a/c/src/tests/sptests/sp23/Makefile.in +++ b/c/src/tests/sptests/sp23/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 TEST=sp23 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp24/Makefile.in b/c/src/tests/sptests/sp24/Makefile.in index 8aac72c88e..a30c1a475b 100644 --- a/c/src/tests/sptests/sp24/Makefile.in +++ b/c/src/tests/sptests/sp24/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 TEST=sp24 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/sp25/Makefile.in b/c/src/tests/sptests/sp25/Makefile.in index cc58f2c0c5..a065dbd6be 100644 --- a/c/src/tests/sptests/sp25/Makefile.in +++ b/c/src/tests/sptests/sp25/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 TEST=sp25 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/spfatal/Makefile.in b/c/src/tests/sptests/spfatal/Makefile.in index a9939875de..e44b222619 100644 --- a/c/src/tests/sptests/spfatal/Makefile.in +++ b/c/src/tests/sptests/spfatal/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 TEST=spfatal @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/sptests/spsize/Makefile.in b/c/src/tests/sptests/spsize/Makefile.in index 5b954ce0ad..bf8ae8f835 100644 --- a/c/src/tests/sptests/spsize/Makefile.in +++ b/c/src/tests/sptests/spsize/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 MANAGERS=io @@ -24,7 +22,7 @@ OBJS=$(C_O_FILES) PGM=${ARCH}/size.exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/support/Makefile.in b/c/src/tests/support/Makefile.in index 109303862a..d67efb6814 100644 --- a/c/src/tests/support/Makefile.in +++ b/c/src/tests/support/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=include stubdr wrapup diff --git a/c/src/tests/support/include/Makefile.in b/c/src/tests/support/include/Makefile.in index 7b6664ab7b..30e7468784 100644 --- a/c/src/tests/support/include/Makefile.in +++ b/c/src/tests/support/include/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= $(srcdir)/tmacros.h @@ -16,7 +14,7 @@ SYS_H_FILES= SRCS=$(H_FILES) $(SYS_H_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/tests/support/stubdr/Makefile.in b/c/src/tests/support/stubdr/Makefile.in index d3eab0c198..84dc839e9e 100644 --- a/c/src/tests/support/stubdr/Makefile.in +++ b/c/src/tests/support/stubdr/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 PGM=${ARCH}/stubdr.rel @@ -27,7 +25,7 @@ S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) SRCS=$(DOCS) $(C_FILES) $(H_FILES) OBJS=$(C_O_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/support/wrapup/Makefile.in b/c/src/tests/support/wrapup/Makefile.in index a4fc16821b..31f78c914b 100644 --- a/c/src/tests/support/wrapup/Makefile.in +++ b/c/src/tests/support/wrapup/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 GENERIC_PIECES=stubdr @@ -16,7 +14,7 @@ GENERIC_PIECES=stubdr OBJS=$(foreach piece, $(GENERIC_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) LIB=$(ARCH)/libtest.a -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/lib.cfg # diff --git a/c/src/tests/tmtests/Makefile.in b/c/src/tests/tmtests/Makefile.in index 73437976d2..c381a590c2 100644 --- a/c/src/tests/tmtests/Makefile.in +++ b/c/src/tests/tmtests/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 all: README diff --git a/c/src/tests/tmtests/include/Makefile.in b/c/src/tests/tmtests/include/Makefile.in index 2c5270e011..ad9869bf96 100644 --- a/c/src/tests/tmtests/include/Makefile.in +++ b/c/src/tests/tmtests/include/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= $(srcdir)/timesys.h @@ -16,7 +14,7 @@ SYS_H_FILES= SRCS=$(H_FILES) $(SYS_H_FILES) -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += diff --git a/c/src/tests/tmtests/tm01/Makefile.in b/c/src/tests/tmtests/tm01/Makefile.in index 624231d6e5..106ffc1074 100644 --- a/c/src/tests/tmtests/tm01/Makefile.in +++ b/c/src/tests/tmtests/tm01/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 TEST=tm01 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm02/Makefile.in b/c/src/tests/tmtests/tm02/Makefile.in index 4e83528582..00d88c3098 100644 --- a/c/src/tests/tmtests/tm02/Makefile.in +++ b/c/src/tests/tmtests/tm02/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 TEST=tm02 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm03/Makefile.in b/c/src/tests/tmtests/tm03/Makefile.in index c2fe306ec3..b79d3779b0 100644 --- a/c/src/tests/tmtests/tm03/Makefile.in +++ b/c/src/tests/tmtests/tm03/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 TEST=tm03 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm04/Makefile.in b/c/src/tests/tmtests/tm04/Makefile.in index 71900a86d7..22af1721f4 100644 --- a/c/src/tests/tmtests/tm04/Makefile.in +++ b/c/src/tests/tmtests/tm04/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 TEST=tm04 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm05/Makefile.in b/c/src/tests/tmtests/tm05/Makefile.in index 1eae878baa..ca9177854f 100644 --- a/c/src/tests/tmtests/tm05/Makefile.in +++ b/c/src/tests/tmtests/tm05/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 TEST=tm05 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm06/Makefile.in b/c/src/tests/tmtests/tm06/Makefile.in index 28a1d11002..48f0041d95 100644 --- a/c/src/tests/tmtests/tm06/Makefile.in +++ b/c/src/tests/tmtests/tm06/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 TEST=tm06 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm07/Makefile.in b/c/src/tests/tmtests/tm07/Makefile.in index f84645ae70..af170e9095 100644 --- a/c/src/tests/tmtests/tm07/Makefile.in +++ b/c/src/tests/tmtests/tm07/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 TEST=tm07 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm08/Makefile.in b/c/src/tests/tmtests/tm08/Makefile.in index ffd6468d04..3080df91f4 100644 --- a/c/src/tests/tmtests/tm08/Makefile.in +++ b/c/src/tests/tmtests/tm08/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 TEST=tm08 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm09/Makefile.in b/c/src/tests/tmtests/tm09/Makefile.in index 441841ec6c..d6af7f56fb 100644 --- a/c/src/tests/tmtests/tm09/Makefile.in +++ b/c/src/tests/tmtests/tm09/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 TEST=tm09 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm10/Makefile.in b/c/src/tests/tmtests/tm10/Makefile.in index e0f895cc6a..7d6654249e 100644 --- a/c/src/tests/tmtests/tm10/Makefile.in +++ b/c/src/tests/tmtests/tm10/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 TEST=tm10 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm11/Makefile.in b/c/src/tests/tmtests/tm11/Makefile.in index f0fc052237..f9871da2d8 100644 --- a/c/src/tests/tmtests/tm11/Makefile.in +++ b/c/src/tests/tmtests/tm11/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 TEST=tm11 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm12/Makefile.in b/c/src/tests/tmtests/tm12/Makefile.in index 57bdb0b521..dc09233b53 100644 --- a/c/src/tests/tmtests/tm12/Makefile.in +++ b/c/src/tests/tmtests/tm12/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 TEST=tm12 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm13/Makefile.in b/c/src/tests/tmtests/tm13/Makefile.in index a206f0ec01..b6242c7d08 100644 --- a/c/src/tests/tmtests/tm13/Makefile.in +++ b/c/src/tests/tmtests/tm13/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 TEST=tm13 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm14/Makefile.in b/c/src/tests/tmtests/tm14/Makefile.in index 7a09622b18..44fe651e53 100644 --- a/c/src/tests/tmtests/tm14/Makefile.in +++ b/c/src/tests/tmtests/tm14/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 TEST=tm14 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm15/Makefile.in b/c/src/tests/tmtests/tm15/Makefile.in index c53b0d4cca..05f5d7696a 100644 --- a/c/src/tests/tmtests/tm15/Makefile.in +++ b/c/src/tests/tmtests/tm15/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 TEST=tm15 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm16/Makefile.in b/c/src/tests/tmtests/tm16/Makefile.in index 890f9c7e03..b42ea2af7b 100644 --- a/c/src/tests/tmtests/tm16/Makefile.in +++ b/c/src/tests/tmtests/tm16/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 TEST=tm16 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm17/Makefile.in b/c/src/tests/tmtests/tm17/Makefile.in index 2f406ef7a7..2e6a0bea66 100644 --- a/c/src/tests/tmtests/tm17/Makefile.in +++ b/c/src/tests/tmtests/tm17/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 TEST=tm17 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm18/Makefile.in b/c/src/tests/tmtests/tm18/Makefile.in index 22edd09117..6669ab25c9 100644 --- a/c/src/tests/tmtests/tm18/Makefile.in +++ b/c/src/tests/tmtests/tm18/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 TEST=tm18 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm19/Makefile.in b/c/src/tests/tmtests/tm19/Makefile.in index 8cf3abef4d..7b1d0c9bb6 100644 --- a/c/src/tests/tmtests/tm19/Makefile.in +++ b/c/src/tests/tmtests/tm19/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 TEST=tm19 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm20/Makefile.in b/c/src/tests/tmtests/tm20/Makefile.in index 0c9b9c39fc..534795e747 100644 --- a/c/src/tests/tmtests/tm20/Makefile.in +++ b/c/src/tests/tmtests/tm20/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 TEST=tm20 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm21/Makefile.in b/c/src/tests/tmtests/tm21/Makefile.in index 1fe54c8c9e..020560c506 100644 --- a/c/src/tests/tmtests/tm21/Makefile.in +++ b/c/src/tests/tmtests/tm21/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 TEST=tm21 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm22/Makefile.in b/c/src/tests/tmtests/tm22/Makefile.in index b58669138b..54e4aca990 100644 --- a/c/src/tests/tmtests/tm22/Makefile.in +++ b/c/src/tests/tmtests/tm22/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 TEST=tm22 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm23/Makefile.in b/c/src/tests/tmtests/tm23/Makefile.in index 2118032322..6838580789 100644 --- a/c/src/tests/tmtests/tm23/Makefile.in +++ b/c/src/tests/tmtests/tm23/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 TEST=tm23 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm24/Makefile.in b/c/src/tests/tmtests/tm24/Makefile.in index 82455e4ba2..1b7b463eb4 100644 --- a/c/src/tests/tmtests/tm24/Makefile.in +++ b/c/src/tests/tmtests/tm24/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 TEST=tm24 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm25/Makefile.in b/c/src/tests/tmtests/tm25/Makefile.in index e76a12ec39..0a2809bf8d 100644 --- a/c/src/tests/tmtests/tm25/Makefile.in +++ b/c/src/tests/tmtests/tm25/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 TEST=tm25 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm26/Makefile.in b/c/src/tests/tmtests/tm26/Makefile.in index 11242ead7e..cab9d13b1a 100644 --- a/c/src/tests/tmtests/tm26/Makefile.in +++ b/c/src/tests/tmtests/tm26/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 TEST=tm26 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm27/Makefile.in b/c/src/tests/tmtests/tm27/Makefile.in index 30a8751cfc..87a08bbcf9 100644 --- a/c/src/tests/tmtests/tm27/Makefile.in +++ b/c/src/tests/tmtests/tm27/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 TEST=tm27 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm28/Makefile.in b/c/src/tests/tmtests/tm28/Makefile.in index 2c3960875f..44bb5a21d7 100644 --- a/c/src/tests/tmtests/tm28/Makefile.in +++ b/c/src/tests/tmtests/tm28/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 TEST=tm28 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tm29/Makefile.in b/c/src/tests/tmtests/tm29/Makefile.in index 623b00dee9..d55070a540 100644 --- a/c/src/tests/tmtests/tm29/Makefile.in +++ b/c/src/tests/tmtests/tm29/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 TEST=tm29 @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tmck/Makefile.in b/c/src/tests/tmtests/tmck/Makefile.in index de6aeabc0d..ed39cab9b6 100644 --- a/c/src/tests/tmtests/tmck/Makefile.in +++ b/c/src/tests/tmtests/tmck/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 TEST=tmck @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tmtests/tmoverhd/Makefile.in b/c/src/tests/tmtests/tmoverhd/Makefile.in index d559e7969e..d16061a4f3 100644 --- a/c/src/tests/tmtests/tmoverhd/Makefile.in +++ b/c/src/tests/tmtests/tmoverhd/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 TEST=tmoverhd @@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS) PGM=${ARCH}/$(TEST).exe -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg # diff --git a/c/src/tests/tools/generic/Makefile.in b/c/src/tests/tools/generic/Makefile.in index af18e14a85..283fdd7740 100644 --- a/c/src/tests/tools/generic/Makefile.in +++ b/c/src/tests/tools/generic/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)/tests diff --git a/c/src/wrapup/Makefile.in b/c/src/wrapup/Makefile.in index 649d0ed2a4..46f7aac927 100644 --- a/c/src/wrapup/Makefile.in +++ b/c/src/wrapup/Makefile.in @@ -6,13 +6,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/lib.cfg LIB=$(PROJECT_RELEASE)/lib/librtemsall.a diff --git a/c/update-tools/Makefile.in b/c/update-tools/Makefile.in index e4ba479e1b..025930cdd2 100644 --- a/c/update-tools/Makefile.in +++ b/c/update-tools/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 @@ -1583,7 +1583,6 @@ if [ "${program_prefix}" = "NONE" ] ; then fi fi -RTEMS_ROOT=`cd $srcdir; pwd` PROJECT_ROOT=`pwd;` # If RTEMS macros are enabled, then use them. Otherwise, use inlines. @@ -1609,7 +1608,7 @@ fi # If the tests are enabled, then find all the test suite Makefiles echo $ac_n "checking Are the test suites enabled? ""... $ac_c" 1>&6 -echo "configure:1613: checking Are the test suites enabled? " >&5 +echo "configure:1612: checking Are the test suites enabled? " >&5 tests_enabled=yes # Check whether --enable-tests or --disable-tests was given. if test "${enable_tests+set}" = set; then @@ -1629,7 +1628,7 @@ fi if test "$tests_enabled" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6 -echo "configure:1633: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5 +echo "configure:1632: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5 if test -d $srcdir/c/src/tests/tools/$target_cpu; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1644,7 +1643,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6 -echo "configure:1648: checking for Makefile.in in c/src/tests/libtests" >&5 +echo "configure:1647: checking for Makefile.in in c/src/tests/libtests" >&5 if test -d $srcdir/c/src/tests/libtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1659,7 +1658,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6 -echo "configure:1663: checking for Makefile.in in c/src/tests/sptests" >&5 +echo "configure:1662: checking for Makefile.in in c/src/tests/sptests" >&5 if test -d $srcdir/c/src/tests/sptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1674,7 +1673,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6 -echo "configure:1678: checking for Makefile.in in c/src/tests/tmtests" >&5 +echo "configure:1677: checking for Makefile.in in c/src/tests/tmtests" >&5 if test -d $srcdir/c/src/tests/tmtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1689,7 +1688,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6 -echo "configure:1693: checking for Makefile.in in c/src/tests/mptests" >&5 +echo "configure:1692: checking for Makefile.in in c/src/tests/mptests" >&5 if test -d $srcdir/c/src/tests/mptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1705,7 +1704,7 @@ fi if test "$RTEMS_HAS_POSIX" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6 -echo "configure:1709: checking for Makefile.in in c/src/tests/psxtests" >&5 +echo "configure:1708: checking for Makefile.in in c/src/tests/psxtests" >&5 if test -d $srcdir/c/src/tests/psxtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1723,7 +1722,7 @@ fi # If the HWAPI is enabled, the find the HWAPI Makefiles echo $ac_n "checking Is the HWAPI enabled? ""... $ac_c" 1>&6 -echo "configure:1727: checking Is the HWAPI enabled? " >&5 +echo "configure:1726: checking Is the HWAPI enabled? " >&5 # Check whether --enable-hwapi or --disable-hwapi was given. if test "${enable_hwapi+set}" = set; then enableval="$enable_hwapi" @@ -1734,7 +1733,7 @@ if test "${enable_hwapi+set}" = set; then makefiles="$makefiles c/src/lib/libhwapi/Makefile" echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6 -echo "configure:1738: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5 +echo "configure:1737: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5 if test -d $srcdir/c/src/lib/libhwapi/analog; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1749,7 +1748,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6 -echo "configure:1753: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5 +echo "configure:1752: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5 if test -d $srcdir/c/src/lib/libhwapi/discrete; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1764,7 +1763,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6 -echo "configure:1768: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5 +echo "configure:1767: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5 if test -d $srcdir/c/src/lib/libhwapi/drivers; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1779,7 +1778,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6 -echo "configure:1783: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5 +echo "configure:1782: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5 if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1794,7 +1793,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6 -echo "configure:1798: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5 +echo "configure:1797: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5 if test -d $srcdir/c/src/lib/libhwapi/serial; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1809,7 +1808,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6 -echo "configure:1813: checking for Makefile.in in c/src/lib/libhwapi/support" >&5 +echo "configure:1812: checking for Makefile.in in c/src/lib/libhwapi/support" >&5 if test -d $srcdir/c/src/lib/libhwapi/support; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1824,7 +1823,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6 -echo "configure:1828: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5 +echo "configure:1827: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5 if test -d $srcdir/c/src/lib/libhwapi/wrapup; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1863,11 +1862,10 @@ fi - # pick up all the Makefiles in required parts of the tree echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6 -echo "configure:1871: checking for Makefile.in in c/build-tools" >&5 +echo "configure:1869: checking for Makefile.in in c/build-tools" >&5 if test -d $srcdir/c/build-tools; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1882,7 +1880,7 @@ fi echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6 -echo "configure:1886: checking for Makefile.in in make" >&5 +echo "configure:1884: checking for Makefile.in in make" >&5 if test -d $srcdir/make; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1897,7 +1895,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6 -echo "configure:1901: checking for Makefile.in in c/src/lib/libmisc" >&5 +echo "configure:1899: checking for Makefile.in in c/src/lib/libmisc" >&5 if test -d $srcdir/c/src/lib/libmisc; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1912,7 +1910,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6 -echo "configure:1916: checking for Makefile.in in c/src/tests/samples" >&5 +echo "configure:1914: checking for Makefile.in in c/src/tests/samples" >&5 if test -d $srcdir/c/src/tests/samples; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1928,6 +1926,8 @@ fi + + # try not to explicitly list a Makefile here trap '' 1 2 15 cat > confcache <<\EOF @@ -2125,7 +2125,6 @@ s%@KSH@%$KSH%g s%@RTEMS_BSP_LIST@%$RTEMS_BSP_LIST%g s%@RTEMS_HOST@%$RTEMS_HOST%g s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g -s%@RTEMS_ROOT@%$RTEMS_ROOT%g s%@RTEMS_USE_OWN_PDIR@%$RTEMS_USE_OWN_PDIR%g s%@RTEMS_HAS_POSIX_API@%$RTEMS_HAS_POSIX_API%g s%@RTEMS_HAS_KA9Q@%$RTEMS_HAS_KA9Q%g diff --git a/configure.in b/configure.in index f2028394df..78dfb4e343 100644 --- a/configure.in +++ b/configure.in @@ -269,7 +269,6 @@ if [[ "${program_prefix}" = "NONE" ]] ; then fi fi -RTEMS_ROOT=`cd $srcdir; pwd` PROJECT_ROOT=`pwd;` # If RTEMS macros are enabled, then use them. Otherwise, use inlines. @@ -345,7 +344,6 @@ AC_ARG_ENABLE(hwapi, \ AC_SUBST(RTEMS_BSP_LIST) AC_SUBST(RTEMS_HOST) AC_SUBST(RTEMS_LIBC_DIR) -AC_SUBST(RTEMS_ROOT) AC_SUBST(RTEMS_USE_OWN_PDIR) AC_SUBST(RTEMS_HAS_POSIX_API) AC_SUBST(RTEMS_HAS_KA9Q) @@ -364,6 +362,8 @@ RTEMS_CHECK_MAKEFILE(c/src/tests/samples) AC_CONFIG_HEADER(c/build-tools/src/config.h) +AC_CONFIG_HEADER(c/build-tools/src/config.h) + # try not to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/doc/Makefile.in b/doc/Makefile.in index 8aa74aba02..4078b14b85 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -6,7 +6,6 @@ @SET_MAKE@ srcdir = @srcdir@ -top_srcdir = @top_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -18,7 +17,7 @@ mandir = @mandir@/man$(manext) program_prefix = @program_prefix@ VPATH=@srcdir@ -include $(RTEMS_CUSTOM) +include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += xxx-your-debris-goes-here 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) 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 |