From f3d07e5db539e0a174b1fdc5d31a4c4d69ad87d6 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 6 Feb 2004 16:54:31 +0000 Subject: 2004-02-06 Ralf Corsepius * wrapup/Makefile.am: Convert to automake-building rules. --- c/src/lib/libbsp/powerpc/dmv177/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am | 24 +++++++++++-------- c/src/lib/libbsp/powerpc/eth_comm/ChangeLog | 4 ++++ .../lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am | 28 +++++++++++++--------- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am | 22 ++++++++++------- c/src/lib/libbsp/powerpc/helas403/ChangeLog | 4 ++++ .../lib/libbsp/powerpc/helas403/wrapup/Makefile.am | 23 +++++++++++------- 8 files changed, 75 insertions(+), 38 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog index a066795596..c621b51c4e 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog +++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog @@ -1,3 +1,7 @@ +2004-02-06 Ralf Corsepius + + * wrapup/Makefile.am: Convert to automake-building rules. + 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am index 59d850bd99..ef41c6d0f6 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am @@ -2,22 +2,26 @@ ## $Id$ ## -OBJS = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \ +include $(top_srcdir)/../../../../automake/compile.am + +EXTRA_LIBRARIES = ../libbsp.a +CLEANFILES = ../libbsp.a +___libbsp_a_SOURCES = + +___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \ ../console$(LIB_VARIANT).rel ../scv64$(LIB_VARIANT).rel \ ../timer$(LIB_VARIANT).rel ../tod$(LIB_VARIANT).rel if HAS_NETWORKING -OBJS += ../sonic$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../sonic$(LIB_VARIANT).rel endif - -OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ +___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -$(ARCH)/libbsp.a: $(OBJS) - $(make-library) +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 = $(ARCH)/libbsp.a +noinst_DATA = ../libbsp$(LIB_VARIANT).a include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index 362df92c7a..c4aa6c32be 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,7 @@ +2004-02-06 Ralf Corsepius + + * wrapup/Makefile.am: Convert to automake-building rules. + 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in canbus/Makefile.am, clock/Makefile.am, diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am index 4260f145d3..86e4398d9a 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am @@ -2,13 +2,20 @@ ## $Id$ ## -OBJS = ../startup$(LIB_VARIANT).rel ../canbus$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ - ../pclock$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel +include $(top_srcdir)/../../../../automake/compile.am + +EXTRA_LIBRARIES = ../libbsp.a +CLEANFILES = ../libbsp.a +___libbsp_a_SOURCES = +___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \ + ../canbus$(LIB_VARIANT).rel ../console$(LIB_VARIANT).rel \ + ../irq$(LIB_VARIANT).rel ../pclock$(LIB_VARIANT).rel \ + ../vectors$(LIB_VARIANT).rel if HAS_NETWORKING -OBJS += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel endif -OBJS += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ +___libbsp_a_LIBADD += \ + ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \ @@ -18,12 +25,11 @@ OBJS += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/exceptions$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/mmu$(LIB_VARIANT).rel -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -$(ARCH)/libbsp.a: $(OBJS) - $(make-library) +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 = $(ARCH)/libbsp.a +noinst_DATA = ../libbsp$(LIB_VARIANT).a include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index 439e23ad7f..3844fe1ace 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,7 @@ +2004-02-06 Ralf Corsepius + + * wrapup/Makefile.am: Convert to automake-building rules. + 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in dlentry/Makefile.am, startup/Makefile.am. Use diff --git a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am index c38d8532d7..62ed35bbf9 100644 --- a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am @@ -2,9 +2,16 @@ ## $Id$ ## -OBJS = ../startup$(LIB_VARIANT).rel ../dlentry$(LIB_VARIANT).rel +include $(top_srcdir)/../../../../automake/compile.am + +EXTRA_LIBRARIES = ../libbsp.a +CLEANFILES = ../libbsp.a +___libbsp_a_SOURCES = + +___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \ + ../dlentry$(LIB_VARIANT).rel -OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ +___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/clock$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/timer$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/console$(LIB_VARIANT).rel \ @@ -12,12 +19,11 @@ OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl$(LIB_VARIANT).rel -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -$(ARCH)/libbsp.a: $(OBJS) - $(make-library) +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 = $(ARCH)/libbsp.a +noinst_DATA = ../libbsp$(LIB_VARIANT).a include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index 0dfde7595c..9fdda9bba3 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog @@ -1,3 +1,7 @@ +2004-02-06 Ralf Corsepius + + * wrapup/Makefile.am: Convert to automake-building rules. + 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in dlentry/Makefile.am, flashentry/Makefile.am, diff --git a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am index 91484188f2..30e21cf126 100644 --- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am @@ -2,22 +2,27 @@ ## $Id$ ## -OBJS = ../startup$(LIB_VARIANT).rel ../dlentry$(LIB_VARIANT).rel \ - ../flashentry$(LIB_VARIANT).rel +include $(top_srcdir)/../../../../automake/compile.am + +EXTRA_LIBRARIES = ../libbsp.a +CLEANFILES = ../libbsp.a +___libbsp_a_SOURCES = + +___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \ + ../dlentry$(LIB_VARIANT).rel ../flashentry$(LIB_VARIANT).rel -OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ +___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/clock$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/timer$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/console$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl$(LIB_VARIANT).rel -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -$(ARCH)/libbsp.a: $(OBJS) - $(make-library) +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 = $(ARCH)/libbsp.a +noinst_DATA = ../libbsp$(LIB_VARIANT).a include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3