diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-12 03:31:07 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-12 03:31:07 +0000 |
| commit | 5133bd66b7719450ad360d0e2a55a6d863a51818 (patch) | |
| tree | 8991da9ed8b6a8880f2e0d5311f30b0107222ae0 /c/src/lib/libbsp/powerpc/score603e | |
| parent | 2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-5133bd66b7719450ad360d0e2a55a6d863a51818.tar.bz2 | |
2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am: Merge-in wrapup/Makefile.am.
* wrapup/Makefile.am: Remove.
* configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/score603e')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/Makefile.am | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/configure.ac | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am | 14 |
4 files changed, 13 insertions, 20 deletions
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 7d037932c2..3028bdf161 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org> + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-02-09 Ralf Corsepius <ralf.corsepius@rtems.org> * vectors/vectors.S: Remove XCOFF support. diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 9a53dcd99c..278727c063 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/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 @@ -76,6 +72,12 @@ vectors_rel_SOURCES = vectors/vectors.S vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +noinst_LIBRARIES = libbsp.a +libbsp_a_SOURCES = +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel tod.rel \ + vectors.rel PCI_bus.rel +libbsp_a_LIBADD += ../../../@RTEMS_CPU@/@exceptions@/rtems-cpu.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = diff --git a/c/src/lib/libbsp/powerpc/score603e/configure.ac b/c/src/lib/libbsp/powerpc/score603e/configure.ac index ee759c1869..325bf04097 100644 --- a/c/src/lib/libbsp/powerpc/score603e/configure.ac +++ b/c/src/lib/libbsp/powerpc/score603e/configure.ac @@ -67,8 +67,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/score603e/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am deleted file mode 100644 index c3c3f0ea36..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am +++ /dev/null @@ -1,14 +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 ../vectors.rel ../PCI_bus.rel -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel - -include $(top_srcdir)/../../../../automake/local.am |