diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-28 06:52:22 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-28 06:52:22 +0000 |
| commit | 8a1009d2c8542ec0135e19bc61e6f59a52ac65e8 (patch) | |
| tree | 296beb1b33bf93d9237da6c123263b5b678ff8d7 /c/src/lib/libbsp/m68k | |
| parent | 2004-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-8a1009d2c8542ec0135e19bc61e6f59a52ac65e8.tar.bz2 | |
Correct oversights in previous patch
Diffstat (limited to 'c/src/lib/libbsp/m68k')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am | 31 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/ChangeLog | 1 |
3 files changed, 4 insertions, 33 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index 0c9e2bb920..42b71ec586 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -3,10 +3,11 @@ * README: Remove references to consolex. * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, network/Makefile.am, startup/Makefile.am, timer/Makefile.am, - tod/Makefile.am. + tod/Makefile.am, wrapup/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, network/Makefile.am - startup/Makefile.am, timer/Makefile.am, tod/Makefile.am: Remove. + startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, + wrapup/Makefile.am: Remove. * configure.ac: Reflect changes above. 2004-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am deleted file mode 100644 index 2fe58526f3..0000000000 --- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - -# We only build the networking device driver if HAS_NETWORKING was defined -if HAS_NETWORKING -NETWORKING_DRIVER = network -endif - -BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER) - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../consolex/$(ARCH)/consolex.rel) \ - ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel - -if HAS_FPSP -OBJS += \ - ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel -endif - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -$(ARCH)/libbsp.a: $(OBJS) - $(make-library) - -noinst_DATA = $(ARCH)/libbsp.a - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index c71b2b42ed..a211a7ae45 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -3,6 +3,7 @@ * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am fatal/Makefile.am, network/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. + Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, fatal/Makefile.am, network/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove. |