summaryrefslogtreecommitdiffstats
path: root/c/src/lib
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-01-30 21:49:51 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-01-30 21:49:51 +0000
commit5c3511e5cff1019e683239fd71f6ea3254e1eccb (patch)
tree6b63bc3b948de974251de8e23f06946f13323363 /c/src/lib
parent421dfef68ecd8f424f987d75df3c3080108c5925 (diff)
downloadrtems-5c3511e5cff1019e683239fd71f6ea3254e1eccb.tar.bz2
Big patch form Ralf Corsepius described in this email:
Here is the result of my nightly work to get RTEMS_ROOT=$srcdir working with different shells and relative/absolute paths. What I did is relatively simple in principle: Instead of setting RTEMS_ROOT in configure.in and then let configure substitute @RTEMS_ROOT@ inside the Makefiles, I now let each Makefile set RTEMS_ROOT from each Makefile's @top_srcdir@ value. The difference is subtile, but with enormous side effects: - If RTEMS_ROOT is set in configure, then the same single value will be propagated to all Makefiles. This breaks using relative paths, as the relative path to the root of the source tree is used inside of all subdirectory Makefiles. - Now each Makefile.in sets RTEMS_ROOT = @top_srcdir@. top_srcdir is computed individually by configure for each single Makefile.in, hereby receiving the correct value, no matter if relative or absolute paths are used. To get this working, I needed to remove setting RTEMS_ROOT from target.cfg.in, because this overrides the value of RTEMS_ROOT from each individual Makefile. Furthermore, I removed RTEMS_CUSTOM from the Makefiles and replaced all "include $(RTEMS_CUSTOM)" directives with"include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP)". Perhaps you don't like this, but I think, to have one variable less is clearer and easier to understand than having several variables refering to the next one. I enclose a small patch to this mail, which - fixes the config.h problem (to finally clearify misunderstands) - removes assignment/subsitution of RTEMS_ROOT from configure.in - contains a workaround for the application Makefile's RTEMS_ROOT problem (reported by Eric) - removes some unused lines from the toplevel Makefile.in - removes assignment of RTEMS_ROOT from make/target.cfg.in
Diffstat (limited to 'c/src/lib')
-rw-r--r--c/src/lib/Makefile.in6
-rw-r--r--c/src/lib/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/a29k/Makefile.in6
-rw-r--r--c/src/lib/libbsp/a29k/portsw/Makefile.in6
-rw-r--r--c/src/lib/libbsp/a29k/portsw/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/a29k/portsw/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/a29k/portsw/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/a29k/portsw/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in6
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/force386/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/force386/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/force386/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/force386/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/force386/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/force386/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/force386/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/go32/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/go32/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/go32/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/go32/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/go32/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/go32/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/go32/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/start332/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/start68k/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/start302/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/network/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/start360/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/idp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/idp/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/idp/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/idp/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/idp/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/idp/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tod/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/mips64orion/Makefile.in6
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/Makefile.in6
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/liblnk/Makefile.in6
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/shmdr/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/start/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/startsis/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/tools/Makefile.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/clock/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/console/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/include/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/shmsupp/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/startup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/timer/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/tools/Makefile.in6
-rw-r--r--c/src/lib/libbsp/unix/posix/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libc/Makefile.in6
-rw-r--r--c/src/lib/libcpu/Makefile.in6
-rw-r--r--c/src/lib/libcpu/hppa1.1/Makefile.in6
-rw-r--r--c/src/lib/libcpu/hppa1.1/clock/Makefile.in6
-rw-r--r--c/src/lib/libcpu/hppa1.1/include/Makefile.in6
-rw-r--r--c/src/lib/libcpu/hppa1.1/milli/Makefile.in6
-rw-r--r--c/src/lib/libcpu/hppa1.1/runway/Makefile.in6
-rw-r--r--c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in6
-rw-r--r--c/src/lib/libcpu/hppa1.1/timer/Makefile.in6
-rw-r--r--c/src/lib/libcpu/m68k/Makefile.in6
-rw-r--r--c/src/lib/libcpu/m68k/m68040/Makefile.in6
-rw-r--r--c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.in6
-rw-r--r--c/src/lib/libcpu/mips64orion/Makefile.in6
-rw-r--r--c/src/lib/libcpu/mips64orion/clock/Makefile.in6
-rw-r--r--c/src/lib/libcpu/mips64orion/include/Makefile.in6
-rw-r--r--c/src/lib/libcpu/mips64orion/timer/Makefile.in6
-rw-r--r--c/src/lib/libcpu/powerpc/Makefile.in6
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/Makefile.in6
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.in6
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/console/Makefile.in6
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/include/Makefile.in6
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.in6
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.in6
-rw-r--r--c/src/lib/libcpu/sparc/Makefile.in6
-rw-r--r--c/src/lib/libcpu/sparc/reg_win/Makefile.in6
-rw-r--r--c/src/lib/libmisc/Makefile.in6
-rw-r--r--c/src/lib/libmisc/assoc/Makefile.in6
-rw-r--r--c/src/lib/libmisc/cpuuse/Makefile.in6
-rw-r--r--c/src/lib/libmisc/error/Makefile.in6
-rw-r--r--c/src/lib/libmisc/monitor/Makefile.in6
-rw-r--r--c/src/lib/libmisc/rtmonuse/Makefile.in6
-rw-r--r--c/src/lib/libmisc/stackchk/Makefile.in6
-rw-r--r--c/src/lib/libmisc/wrapup/Makefile.in6
-rw-r--r--c/src/lib/librtems++/Makefile.in6
-rw-r--r--c/src/lib/start/Makefile.in6
-rw-r--r--c/src/lib/start/a29k/Makefile.in6
-rw-r--r--c/src/lib/start/i960/Makefile.in6
-rw-r--r--c/src/lib/start/m68k/Makefile.in6
-rw-r--r--c/src/lib/start/mips64orion/Makefile.in6
-rw-r--r--c/src/lib/wrapup/Makefile.in6
245 files changed, 490 insertions, 980 deletions
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