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/helas403/ChangeLog | 6 ++++++ c/src/lib/libbsp/powerpc/helas403/Makefile.am | 16 ++++++++++++---- c/src/lib/libbsp/powerpc/helas403/configure.ac | 3 +-- c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am | 20 -------------------- 4 files changed, 19 insertions(+), 26 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am (limited to 'c/src/lib/libbsp/powerpc/helas403') diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index c473570dbc..c86e6c818d 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/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 * dlentry/dlentry.S, flashentry/flashentry.S: diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am index cc51a252fc..f655a2e351 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/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 @@ -45,6 +41,18 @@ startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ startup_rel_CPPFLAGS = $(AM_CPPFLAGS) startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +noinst_LIBRARIES = libbsp.a +libbsp_a_SOURCES = + +libbsp_a_LIBADD = startup.rel dlentry.rel flashentry.rel + +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/console.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/vectors.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/ictrl.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.ac b/c/src/lib/libbsp/powerpc/helas403/configure.ac index 2c52325951..9c20c40799 100644 --- a/c/src/lib/libbsp/powerpc/helas403/configure.ac +++ b/c/src/lib/libbsp/powerpc/helas403/configure.ac @@ -31,8 +31,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/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am deleted file mode 100644 index 47291b9199..0000000000 --- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = - -___libbsp_a_LIBADD = ../startup.rel ../dlentry.rel ../flashentry.rel - -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/console.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl.rel - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3