From 5133bd66b7719450ad360d0e2a55a6d863a51818 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 12 Feb 2005 03:31:07 +0000 Subject: 2005-02-11 Ralf Corsepius * Makefile.am: Merge-in wrapup/Makefile.am. * wrapup/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 6 ++++++ c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 13 +++++++++---- c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac | 3 +-- c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 17 ----------------- 4 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am (limited to 'c/src/lib/libbsp/powerpc/ppcn_60x') diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 7fe30fa3ad..1ab7e80de2 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-02-10 Ralf Corsepius * vectors/vectors.S: Remove PPC_ABI_POWEROPEN. diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index 9af9eefa68..1c4f9c4b3c 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -95,6 +91,15 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif +noinst_LIBRARIES = libbsp.a +libbsp_a_SOURCES = +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel tod.rel \ + nvram.rel universe.rel pci.rel vectors.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif +libbsp_a_LIBADD += ../../../@RTEMS_CPU@/@exceptions@/rtems-cpu.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST += STATUS diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac index fc4c432c47..f61f79d428 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac @@ -60,8 +60,7 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am deleted file mode 100644 index c513644a7f..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../timer.rel \ - ../tod.rel ../nvram.rel ../universe.rel ../pci.rel ../vectors.rel -if HAS_NETWORKING -___libbsp_a_LIBADD += ../network.rel -endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3