From a14fba32cb8b01c675d79d0074d99dd5cff29603 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 30 Sep 2008 10:38:36 +0000 Subject: =?UTF-8?q?2008-09-30=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Makefile.am: Eliminate bsp.am. Build startup files as side-effect of building libbspstart.a, using automake-rules. --- c/src/lib/libbsp/m68k/idp/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/idp/Makefile.am | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libbsp/m68k/idp') diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index d75aef2c3d..c6e2ded702 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,8 @@ +2008-09-30 Ralf Corsépius + + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + 2008-09-29 Ralf Corsépius * Makefile.am: Eliminate *_SOURCES. diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index 6d800404a0..2fb0f6cf38 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../bsp.am include_bspdir = $(includedir)/bsp @@ -21,14 +20,13 @@ DISTCLEANFILES = include/bspopts.h include_HEADERS += include/leds.h nodist_include_HEADERS += ../../shared/include/coverhd.h -EXTRA_DIST = ../../m68k/shared/start.S -start.$(OBJEXT): ../../m68k/shared/start.S - $(CPPASCOMPILE) -o $@ -c $< +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = ../../m68k/shared/start.S project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup @@ -46,7 +44,7 @@ libbsp_a_SOURCES += console/console.c console/leds.c console/mc68ec.c \ # timer libbsp_a_SOURCES += timer/timer.c timer/timerisr.S -EXTRA_DIST += include/README +EXTRA_DIST = include/README EXTRA_DIST += times libbsp_a_LIBADD = \ -- cgit v1.2.3