From 89b253c6f41acea484c4860e0587666612b33761 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 6 Feb 2004 17:24:21 +0000 Subject: 2004-02-06 Ralf Corsepius * wrapup/Makefile.am: Convert to automake-building rules. --- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 4 ++++ .../lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 23 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 98a4bafdf8..a2f41eb421 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am index f78a03efaa..f2483b4327 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -2,23 +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 ../timer$(LIB_VARIANT).rel \ ../tod$(LIB_VARIANT).rel ../nvram$(LIB_VARIANT).rel \ ../universe$(LIB_VARIANT).rel ../pci$(LIB_VARIANT).rel \ ../vectors$(LIB_VARIANT).rel if HAS_NETWORKING -OBJS += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel endif +___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel -OBJS += ../@exceptions@/rtems-cpu$(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