From 4ca704ce3de14b207f7d90da1ebef6e956d32303 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2008 14:07:47 +0000 Subject: =?UTF-8?q?2008-09-29=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/c4x/c4xsim/ChangeLog | 5 +++++ c/src/lib/libbsp/c4x/c4xsim/Makefile.am | 10 ++++------ c/src/lib/libbsp/sparc/erc32/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/erc32/Makefile.am | 10 ++++------ c/src/lib/libbsp/sparc/leon2/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/leon2/Makefile.am | 20 ++++---------------- c/src/lib/libbsp/sparc/leon3/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/leon3/Makefile.am | 17 ++++------------- 8 files changed, 36 insertions(+), 41 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index 4ff9a362ca..098ba1d0a0 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 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/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am index e356e88cae..97552374c1 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am @@ -9,7 +9,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal SUBDIRS = . tools include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../bsp.am dist_project_lib_DATA = bsp_specs @@ -22,14 +21,13 @@ DISTCLEANFILES = include/bspopts.h include_HEADERS += include/simio.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 -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup @@ -50,7 +48,7 @@ libbsp_a_SOURCES += console/debugio.c # timer libbsp_a_SOURCES += timer/timer.c -EXTRA_DIST += times +EXTRA_DIST = times include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index 847c5974c3..e07fa666f5 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 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/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index 7e0e1832cd..cc45b2ecef 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/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 @@ -25,14 +24,13 @@ SUBDIRS = . tools include_HEADERS += include/erc32.h include_HEADERS += include/coverhd.h -EXTRA_DIST = ../../sparc/shared/start.S -start.$(OBJEXT): ../../sparc/shared/start.S - $(CPPASCOMPILE) -o $@ -c $< +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = ../../sparc/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 @@ -67,7 +65,7 @@ if HAS_NETWORKING libbsp_a_LIBADD += erc32sonic.rel endif -EXTRA_DIST += times +EXTRA_DIST = times include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog index f07f3c539f..eeb1cb29b4 100644 --- a/c/src/lib/libbsp/sparc/leon2/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 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/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index d2579f6238..b1b4972f43 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/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 @@ -45,15 +44,13 @@ SUBDIRS = . tools include_HEADERS += include/leon.h include_HEADERS += include/coverhd.h -EXTRA_DIST = ../../sparc/shared/start.S -start.$(OBJEXT): ../../sparc/shared/start.S - $(CPPASCOMPILE) -o $@ -c $< - +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = ../../sparc/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 @@ -69,40 +66,31 @@ libbsp_a_SOURCES += console/console.c console/debugputs.c # clock libbsp_a_SOURCES += clock/ckinit.c # AMBA PnP Scanning -# amba libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c # PCI -# pci libbsp_a_SOURCES += pci/pci.c ../../sparc/shared/pci/pcifinddevice.c # RASTA Kit -# rasta libbsp_a_SOURCES += rasta/rasta.c # Companion Chip Kit -# cchip libbsp_a_SOURCES += cchip/cchip.c # B1553BRM -# brm libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c \ ../../sparc/shared/1553/b1553brm_pci.c \ ../../sparc/shared/1553/b1553brm_rasta.c # CAN -# can libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \ ../../sparc/shared/can/occan_pci.c \ ../../sparc/shared/can/grcan.c \ ../../sparc/shared/can/grcan_rasta.c # SpaceWire -# spw libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c \ ../../sparc/shared/spw/grspw_pci.c ../../sparc/shared/spw/grspw_rasta.c # UART (RAW) -# uart libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart.c \ ../../sparc/shared/uart/apbuart_pci.c \ ../../sparc/shared/uart/apbuart_rasta.c # I2CMST include_HEADERS += ../../sparc/shared/include/i2cmst.h -# i2cmst libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c # timer @@ -134,7 +122,7 @@ libbsp_a_LIBADD += leon_open_eth.rel libbsp_a_LIBADD += leon_smc91111.rel endif -EXTRA_DIST += times +EXTRA_DIST = times include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog index 8c5961171c..4d2181c0ca 100644 --- a/c/src/lib/libbsp/sparc/leon3/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 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/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index fb007006b2..6dc636d32d 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/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 @@ -28,15 +27,13 @@ SUBDIRS = . tools include_HEADERS += include/leon.h include_HEADERS += include/coverhd.h -EXTRA_DIST = ../../sparc/shared/start.S -start.$(OBJEXT): ../../sparc/shared/start.S - $(CPPASCOMPILE) -o $@ -c $< - +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = ../../sparc/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 @@ -62,40 +59,34 @@ libbsp_a_SOURCES += clock/ckinit.c # PCI include_HEADERS += ../../sparc/shared/include/pci.h -# pci libbsp_a_SOURCES += pci/pci.c ../../sparc/shared/pci/pcifinddevice.c # B1553BRM include_HEADERS += ../../sparc/shared/include/b1553brm.h \ ../../sparc/shared/include/b1553brm_pci.h -# brm libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c \ ../../sparc/shared/1553/b1553brm_pci.c # CAN include_HEADERS += ../../sparc/shared/include/occan.h \ ../../sparc/shared/include/occan_pci.h ../../sparc/shared/include/grcan.h -# can libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \ ../../sparc/shared/can/occan_pci.c ../../sparc/shared/can/grcan.c # SpaceWire include_HEADERS += ../../sparc/shared/include/grspw.h \ ../../sparc/shared/include/grspw_pci.h -# spw libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c \ ../../sparc/shared/spw/grspw_pci.c # UART include_HEADERS += ../../sparc/shared/include/apbuart.h \ ../../sparc/shared/include/apbuart_pci.h -# uart libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart.c \ ../../sparc/shared/uart/apbuart_pci.c # I2CMST include_HEADERS += ../../sparc/shared/include/i2cmst.h -# i2cmst libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c # timer @@ -125,8 +116,8 @@ leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif +EXTRA_DIST = shmsupp/README if HAS_MP -EXTRA_DIST += shmsupp/README # shmsupp libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ shmsupp/mpisr.c -- cgit v1.2.3