summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/csb360
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libbsp/m68k/csb360')
-rw-r--r--c/src/lib/libbsp/m68k/csb360/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/csb360/Makefile.am19
2 files changed, 10 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog
index bcb095e0e8..a67d1afb49 100644
--- a/c/src/lib/libbsp/m68k/csb360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * Makefile.am: Rework to avoid .rel files.
+
2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com>
* startup/bspstart.c: Refactored and renamed initialization routines to
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index c54f5a5a98..8ea9d104ba 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -28,26 +28,19 @@ project_lib_DATA = start.$(OBJEXT)
dist_project_lib_DATA += startup/linkcmds
-noinst_PROGRAMS += startup.rel
-startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
+startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
../../shared/bsppredriverhook.c \
../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \
startup/bspstart.c startup/init5272.c ../../shared/bootcard.c \
../../shared/sbrk.c ../../m68k/shared/setvec.c \
../../shared/gnatinstallhandler.c
-startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
-startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# console
-noinst_PROGRAMS += console.rel
-console_rel_SOURCES = console/console-io.c ../../shared/console-polled.c
-console_rel_CPPFLAGS = $(AM_CPPFLAGS)
-console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+console_SOURCES = console/console-io.c ../../shared/console-polled.c
noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel console.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \
+libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES)
+
+libbsp_a_LIBADD = \
+ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \
../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \
../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel