diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-29 20:52:22 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-29 20:52:22 +0000 |
| commit | 81ec50442dacc498cc69106cbec689028f2094df (patch) | |
| tree | 076d631792c5306c5f0b71447922bab7b17175b1 /c | |
| parent | 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-81ec50442dacc498cc69106cbec689028f2094df.tar.bz2 | |
2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
of building libbspstart.a, using automake-rules.
Diffstat (limited to 'c')
20 files changed, 101 insertions, 89 deletions
diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index 88040a1761..ff82eb6a1a 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am index a9c6e2b183..b93be714b1 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ep1a/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 @@ -22,7 +21,14 @@ nodist_include_HEADERS += ../../shared/include/coverhd.h ### dist_project_lib_DATA += startup/linkcmds -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = start/start.S +project_lib_DATA = start.$(OBJEXT) + +libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S +project_lib_DATA += rtems_crti.$(OBJEXT) + +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup @@ -80,16 +86,6 @@ libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c \ ../shared/vme/vme_universe.c \ ../../shared/vmeUniverse/vme_am_defs.h -EXTRA_DIST = start/start.S -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA = start.$(OBJEXT) - -EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA += rtems_crti.$(OBJEXT) - libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog index bd89998a81..6a72f8d896 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 9f1e9d9dd7..9a8fed908b 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/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,11 @@ include_HEADERS += include/coverhd.h nodist_include_HEADERS += ../../shared/tod.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) -EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< +libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds \ @@ -41,7 +37,7 @@ dist_project_lib_DATA += startup/linkcmds \ startup/linkcmds.icecube \ startup/linkcmds.pm520 -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # bestcomm diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog index eff5700375..49e1279cbd 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index 7305923840..6a9ee89856 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/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 @@ -24,14 +23,11 @@ include_HEADERS += include/coverhd.h nodist_include_HEADERS += ../../shared/tod.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) -EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< +libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds \ @@ -40,7 +36,7 @@ dist_project_lib_DATA += startup/linkcmds \ startup/linkcmds.mpc8349eamds \ startup/linkcmds.hsc_cm01 -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # mpc83xx_regs @@ -111,7 +107,7 @@ libbsp_a_LIBADD += network.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mpc83xx/tsec.rel endif -EXTRA_DIST += README.mpc8349eamds +EXTRA_DIST = README.mpc8349eamds EXTRA_DIST += times.mpc8349eamds ### XXX diff --git a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog index 9ccdb32cfc..bd771d6999 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog +++ b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am index a0436f664b..11a5dcafdb 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am +++ b/c/src/lib/libbsp/powerpc/haleakala/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,14 +19,13 @@ DISTCLEANFILES = include/bspopts.h include_HEADERS += include/coverhd.h -EXTRA_DIST = ../../powerpc/shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = ../../powerpc/shared/start/rtems_crti.S project_lib_DATA = rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup @@ -63,7 +61,7 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel -EXTRA_DIST += times +EXTRA_DIST = times include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog index d3b2c78698..536fb7017e 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index 97d2586ead..63b6eb1007 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/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 @@ -16,21 +15,17 @@ DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -# Object files -EXTRA_DIST = startup/start.S -start.$(OBJEXT): startup/start.S - $(CPPASCOMPILE) -o $@ -c $< +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = startup/start.S project_lib_DATA = start.$(OBJEXT) -EXTRA_DIST += ../shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< +libbspstart_a_SOURCES += ../shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) # Link commands dist_project_lib_DATA += startup/linkcmds startup/linkcmds.memory -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # Includes diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index a4d1886261..cb85da4f65 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index 5a4fd75a73..d018e3763d 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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 @@ -22,14 +21,13 @@ noinst_PROGRAMS = 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 = # pclock diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index a4d028247d..b6c3927f21 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 80987ddd1b..3392da5915 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -4,12 +4,9 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories SUBDIRS = . tools include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../bsp.am include_bspdir = $(includedir)/bsp @@ -25,19 +22,16 @@ 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) -EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< +libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup @@ -55,11 +49,11 @@ libbsp_a_SOURCES += ../../shared/console-polled.c # debugio libbsp_a_SOURCES += console/console-io.c console/consupp.S -include_bsp_HEADERS = irq/irq.h # irq +include_bsp_HEADERS = irq/irq.h libbsp_a_SOURCES += irq/irq_init.c irq/no_pic.c -EXTRA_DIST += vectors/README +EXTRA_DIST = vectors/README # vectors libbsp_a_SOURCES += vectors/align_h.S @@ -68,9 +62,8 @@ include_bsp_HEADERS += \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h -if HAS_MP EXTRA_DIST += shmsupp/README - +if HAS_MP # shmdr libbsp_a_SOURCES += \ shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c shmsupp/mpisr.c diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index ec50c73993..d9f871b419 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 099748afcc..828bca6eb0 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/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 @@ -24,7 +23,14 @@ include_HEADERS += include/coverhd.h include/gen2.h ### dist_project_lib_DATA += startup/linkcmds -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = start/start.S +project_lib_DATA = start.$(OBJEXT) + +libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S +project_lib_DATA += rtems_crti.$(OBJEXT) + +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup @@ -77,16 +83,6 @@ libbsp_a_SOURCES += \ ../../shared/vmeUniverse/vme_am_defs.h \ ../shared/vme/vmeconfig.c -EXTRA_DIST = start/start.S -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA = start.$(OBJEXT) - -EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA += rtems_crti.$(OBJEXT) - libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog index 05405d0d46..3df36ce137 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am index 031cac73b4..a9927afa67 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/tqm8xx/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 @@ -29,20 +28,17 @@ include_bsp_HEADERS = include/tqm.h include/8xx_immap.h \ EXTRA_DIST = times-tqm866 -EXTRA_DIST += startup/start.S -start.$(OBJEXT): startup/start.S - $(CPPASCOMPILE) -o $@ -c $< +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = startup/start.S project_lib_DATA = start.$(OBJEXT) -EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< +libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds.base \ startup/linkcmds.tqm8xx -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # irq diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog index 77bf3cb507..85ca2fc633 100644 --- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog +++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate bsp.am. Build startup files as side-effect + of building libbspstart.a, using automake-rules. + +2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Eliminate *_SOURCES. 2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am index 2801025848..6351544659 100644 --- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex/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 @@ -26,14 +25,13 @@ noinst_PROGRAMS = include_HEADERS += include/coverhd.h -EXTRA_DIST = ../../powerpc/shared/start/rtems_crti.S -rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S - $(CPPASCOMPILE) -o $@ -c $< +noinst_LIBRARIES = libbspstart.a +libbspstart_a_SOURCES = ../../powerpc/shared/start/rtems_crti.S project_lib_DATA = rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_LIBRARIES = libbsp.a +noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup @@ -82,7 +80,7 @@ if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -EXTRA_DIST += times +EXTRA_DIST = times include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am |