From 5c3511e5cff1019e683239fd71f6ea3254e1eccb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 30 Jan 1998 21:49:51 +0000 Subject: Big patch form Ralf Corsepius described in this email: Here is the result of my nightly work to get RTEMS_ROOT=$srcdir working with different shells and relative/absolute paths. What I did is relatively simple in principle: Instead of setting RTEMS_ROOT in configure.in and then let configure substitute @RTEMS_ROOT@ inside the Makefiles, I now let each Makefile set RTEMS_ROOT from each Makefile's @top_srcdir@ value. The difference is subtile, but with enormous side effects: - If RTEMS_ROOT is set in configure, then the same single value will be propagated to all Makefiles. This breaks using relative paths, as the relative path to the root of the source tree is used inside of all subdirectory Makefiles. - Now each Makefile.in sets RTEMS_ROOT = @top_srcdir@. top_srcdir is computed individually by configure for each single Makefile.in, hereby receiving the correct value, no matter if relative or absolute paths are used. To get this working, I needed to remove setting RTEMS_ROOT from target.cfg.in, because this overrides the value of RTEMS_ROOT from each individual Makefile. Furthermore, I removed RTEMS_CUSTOM from the Makefiles and replaced all "include $(RTEMS_CUSTOM)" directives with"include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP)". Perhaps you don't like this, but I think, to have one variable less is clearer and easier to understand than having several variables refering to the next one. I enclose a small patch to this mail, which - fixes the config.h problem (to finally clearify misunderstands) - removes assignment/subsitution of RTEMS_ROOT from configure.in - contains a workaround for the application Makefile's RTEMS_ROOT problem (reported by Eric) - removes some unused lines from the toplevel Makefile.in - removes assignment of RTEMS_ROOT from make/target.cfg.in --- c/src/lib/libbsp/m68k/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/dmv152/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/dmv152/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/dmv152/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/start/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/start332/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/start/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/start68k/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/start/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/start302/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/network/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/start/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/start360/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/idp/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/idp/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/idp/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/idp/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/idp/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/idp/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme136/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme136/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme136/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147s/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/tod/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/console/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/include/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/start/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in | 6 ++---- c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in | 6 ++---- 97 files changed, 194 insertions(+), 388 deletions(-) (limited to 'c/src/lib/libbsp/m68k') 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 # -- cgit v1.2.3