diff options
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am | 24 |
2 files changed, 19 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index 29c2ac5a6a..3d95f8ee31 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,7 @@ +2004-02-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * wrapup/Makefile.am: Convert to automake-building rules. + 2004-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Merge-in clock/Makefile.am, console/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 d893cef875..16d68e5cac 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am @@ -2,14 +2,21 @@ ## $Id$ ## -OBJS = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ +include $(top_srcdir)/../../../../automake/compile.am + +EXTRA_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 if HAS_NETWORKING -OBJS += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel endif -OBJS += ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ +___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 \ @@ -19,12 +26,11 @@ OBJS += ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ ../../../../libcpu/powerpc/mpc8xx/timer$(LIB_VARIANT).rel \ ../../../../libcpu/powerpc/mpc8xx/exceptions$(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 |