From 57a40406666d93e6219b5a33a99e56adeb342d11 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 30 Sep 2008 07:12:11 +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/sh/gensh1/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh1/Makefile.am | 11 ++++------- c/src/lib/libbsp/sh/gensh2/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh2/Makefile.am | 9 ++++----- c/src/lib/libbsp/sh/gensh4/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh4/Makefile.am | 11 ++++------- c/src/lib/libbsp/sh/shsim/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/shsim/Makefile.am | 8 +++----- c/src/lib/libbsp/sh/simsh4/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/simsh4/Makefile.am | 8 +++----- 10 files changed, 43 insertions(+), 29 deletions(-) (limited to 'c/src/lib/libbsp/sh') diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index 3dccbf4576..fe6ca3ce35 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/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/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 43a3e61f42..bc4260a592 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/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 @@ -20,15 +19,13 @@ DISTCLEANFILES = include/bspopts.h include_HEADERS += include/coverhd.h -EXTRA_DIST = start/start.S -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< - +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = start/start.S project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen @@ -59,7 +56,7 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/delay.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel -EXTRA_DIST += times +EXTRA_DIST = times include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index 00da9fa8ea..0a2f294e73 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/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/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 1003189e41..c7f466bf47 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/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 @@ -20,15 +19,15 @@ DISTCLEANFILES = include/bspopts.h include_HEADERS += include/coverhd.h -EXTRA_DIST = start/start.S start/start.ram start/start.rom -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< +EXTRA_DIST = start/start.ram start/start.rom +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = start/start.S project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds.ram \ startup/linkcmds.rom -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index 7f03f93921..314a8d7417 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/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/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index b69c499ce0..bdca570375 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/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,16 +20,14 @@ DISTCLEANFILES = include/bspopts.h include_HEADERS += include/sdram.h include_HEADERS += include/coverhd.h -EXTRA_DIST = start/start.S -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< - +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = start/start.S project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds.rom \ startup/linkcmds.rom2ram -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup @@ -50,7 +47,7 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel -EXTRA_DIST += times +EXTRA_DIST = times include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index 6a6ff4fc57..821b1000c2 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/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/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 7603af2e03..48d71bea76 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/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/gdbsci.h nodist_include_HEADERS += ../../shared/include/coverhd.h -EXTRA_DIST = start/start.S -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = start/start.S project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds.sim -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog index ecb4d42b08..8bdd77a5f7 100644 --- a/c/src/lib/libbsp/sh/simsh4/ChangeLog +++ b/c/src/lib/libbsp/sh/simsh4/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/sh/simsh4/Makefile.am b/c/src/lib/libbsp/sh/simsh4/Makefile.am index 4e38040ecb..959107561a 100644 --- a/c/src/lib/libbsp/sh/simsh4/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/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 @@ -27,15 +26,14 @@ include_HEADERS += include/syscall.h include_HEADERS += include/ramdisk.h include_HEADERS += include/coverhd.h -EXTRA_DIST = start/start.S -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = start/start.S project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds-le \ startup/linkcmds-le.coff -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -- cgit v1.2.3