1 files changed, 13 insertions, 24 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am
index f833dcbeca..0008a7fe6c 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am
@@ -4,33 +4,22 @@
 
 include $(top_srcdir)/../../../../automake/compile.am
 
-EXTRA_LIBRARIES = ../libbsp.a
+noinst_LIBRARIES = ../libbsp.a
 CLEANFILES = ../libbsp.a
 ___libbsp_a_SOURCES =
-___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel \
-    ../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \
-    ../pci$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \
-    ../tod$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel \
-    ../GT64260$(LIB_VARIANT).rel
+___libbsp_a_LIBADD = ../pclock.rel ../console.rel ../irq.rel ../pci.rel \
+    ../startup.rel ../tod.rel ../vectors.rel ../GT64260.rel
 if HAS_NETWORKING
-___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel
+___libbsp_a_LIBADD += ../network.rel
 endif
-___libbsp_a_LIBADD += ../vme$(LIB_VARIANT).rel
-___libbsp_a_LIBADD += \
-    ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \
-    ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \
-    ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
-    ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \
-    ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock$(LIB_VARIANT).rel \
-    ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions$(LIB_VARIANT).rel \
-    ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu$(LIB_VARIANT).rel \
-    ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer$(LIB_VARIANT).rel
-
-EXTRA_LIBRARIES += ../libbsp_g.a
-CLEANFILES += ../libbsp_g.a
-___libbsp_g_a_SOURCES = $(___libbsp_a_SOURCES)
-___libbsp_g_a_LIBADD = $(___libbsp_a_LIBADD)
-
-noinst_DATA = ../libbsp$(LIB_VARIANT).a
+___libbsp_a_LIBADD += ../vme.rel
+___libbsp_a_LIBADD += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
+    ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
+    ../../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
+    ../@exceptions@/rtems-cpu.rel \
+    ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock.rel \
+    ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions.rel \
+    ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu.rel \
+    ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer.rel
 
 include $(top_srcdir)/../../../../automake/local.am