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/mbx8xx/wrapup/Makefile.am | 35 ++++++++-------------- 1 file changed, 13 insertions(+), 22 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am') diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am index 16d68e5cac..39738ec8a4 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am @@ -4,33 +4,24 @@ 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 ../irq$(LIB_VARIANT).rel \ - ../ide$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../pclock.rel ../irq.rel ../ide.rel ../startup.rel \ + ../console.rel ../vectors.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network.rel endif -___libbsp_a_LIBADD += \ - ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/shared/cache$(LIB_VARIANT).rel \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/console-generic$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/cpm$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/mmu$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/timer$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/exceptions$(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 += ../../../../libcpu/powerpc/shared/cpuIdent.rel \ + ../../../../libcpu/powerpc/shared/cache.rel \ + ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/powerpc/mpc8xx/clock.rel \ + ../../../../libcpu/powerpc/mpc8xx/console-generic.rel \ + ../../../../libcpu/powerpc/mpc8xx/cpm.rel \ + ../../../../libcpu/powerpc/mpc8xx/mmu.rel \ + ../../../../libcpu/powerpc/mpc8xx/timer.rel \ + ../../../../libcpu/powerpc/mpc8xx/exceptions.rel include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3