From 71cbb666a432fccaaf351493465edca9fad3f719 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 3 Jan 2005 04:16:13 +0000 Subject: 2005-01-02 Ralf Corsepius * Makefile.am, wrapup/Makefile.am: Remove build-variant support. --- c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/ppcn_60x/wrapup') diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am index f2483b4327..c513644a7f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -4,24 +4,14 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../timer$(LIB_VARIANT).rel \ - ../tod$(LIB_VARIANT).rel ../nvram$(LIB_VARIANT).rel \ - ../universe$(LIB_VARIANT).rel ../pci$(LIB_VARIANT).rel \ - ../vectors$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../timer.rel \ + ../tod.rel ../nvram.rel ../universe.rel ../pci.rel ../vectors.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network.rel endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(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 += ../@exceptions@/rtems-cpu.rel include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3