9 files changed, 18 insertions, 20 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/Makefile.in
index 6dd1f0af8c..0875b57576 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/m68k/mvme167
+top_builddir = ../..
+subdir = m68k/mvme167
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/m68k/mvme167/bsp_specs b/c/src/lib/libbsp/m68k/mvme167/bsp_specs
index dcaf999860..d59875e3e6 100644
--- a/c/src/lib/libbsp/m68k/mvme167/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme167/bsp_specs
@@ -8,7 +8,7 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *endfile:
-crtend.o%s crtn.o%s
+%{qelf: crtend.o%s crtn.o%s}
 
 *lib:
 %{!qrtems: %(old_lib)} %{qrtems: --start-group \
@@ -20,7 +20,7 @@ elflinkcmds%s}}}
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: \
 %{!qrtems_debug: start.o%s} \
-%{qrtems_debug: start_g.o%s} crti.o%s crtbegin.o%s}
+%{qrtems_debug: start_g.o%s} %{qelf crti.o%s crtbegin.o%s}}
 
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
diff --git a/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in
index 03b974f7d7..9630105ebc 100644
--- a/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/mvme167/clock
+top_builddir = ../../..
+subdir = m68k/mvme167/clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.in
index 6c18225522..179f7c612a 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/mvme167/console
+top_builddir = ../../..
+subdir = m68k/mvme167/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in
index edf06bfb87..5502871c9b 100644
--- a/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/mvme167/fatal
+top_builddir = ../../..
+subdir = m68k/mvme167/fatal
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.in
index 2d51161580..532a72f6d8 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/mvme167/include
+top_builddir = ../../..
+subdir = m68k/mvme167/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in
index 3f96754246..9b988724ab 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/mvme167/startup
+top_builddir = ../../..
+subdir = m68k/mvme167/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in
index 6fb4ef6715..81a75ceb22 100644
--- a/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/mvme167/timer
+top_builddir = ../../..
+subdir = m68k/mvme167/timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
index ee3195533e..c9413a52a8 100644
--- a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/mvme167/wrapup
+top_builddir = ../../..
+subdir = m68k/mvme167/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -27,8 +27,6 @@ OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
     ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) \
     $(wildcard \
     ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) \
-    $(wildcard \
-    ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) \
     $(foreach piece, $(GENERIC_PIECES), \
     ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB = $(ARCH)/libbsp.a