From 37064d8139be4c6a756418bc12f22bdb67ff63d0 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 6 Feb 2004 17:36:54 +0000 Subject: 2004-02-06 Ralf Corsepius * wrapup/Makefile.am: Convert to automake-building rules. --- c/src/lib/libbsp/powerpc/psim/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am | 18 +++++++++++------- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 4 ++++ .../lib/libbsp/powerpc/score603e/wrapup/Makefile.am | 21 ++++++++++++--------- 4 files changed, 31 insertions(+), 16 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index c6e4274a64..d99a4e66ba 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,7 @@ +2004-02-06 Ralf Corsepius + + * wrapup/Makefile.am: Convert to automake-building rules. + 2004-02-03 Ralf Corsepius * configure.ac: Remove RTEMS_CHECK_MULTIPROCESSING. diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am index b7a8c14dcb..655c018a52 100644 --- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am @@ -3,19 +3,23 @@ ## include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -OBJS = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \ +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 ../timer$(LIB_VARIANT).rel \ ../vectors$(LIB_VARIANT).rel if HAS_MP -OBJS += ../shmsupp$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../shmsupp$(LIB_VARIANT).rel endif -OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel -$(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/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 37dc89816b..1767e725a3 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,7 @@ +2004-02-06 Ralf Corsepius + + * wrapup/Makefile.am: Convert to automake-building rules. + 2004-01-31 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, diff --git a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am index 2fae0dbd9c..31780f909e 100644 --- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am @@ -2,19 +2,22 @@ ## $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 ../timer$(LIB_VARIANT).rel \ ../tod$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel \ ../PCI_bus$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel -OBJS += ../@exceptions@/$(ARCH)/*.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