From e94666ddc5133b44923a1c3a2f1b21043e0c6fdd Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2008 03:43: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: Move noinst_LIBRARIES = libbsp.a before its components. --- c/src/lib/libbsp/arm/csb336/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/csb336/Makefile.am | 3 ++- c/src/lib/libbsp/arm/csb337/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/csb337/Makefile.am | 3 ++- c/src/lib/libbsp/arm/edb7312/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/edb7312/Makefile.am | 3 ++- c/src/lib/libbsp/arm/gba/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/gba/Makefile.am | 3 ++- c/src/lib/libbsp/arm/gp32/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/gp32/Makefile.am | 3 ++- c/src/lib/libbsp/arm/lpc24xx/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 6 ++---- c/src/lib/libbsp/arm/nds/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/nds/Makefile.am | 3 ++- c/src/lib/libbsp/arm/rtl22xx/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 3 ++- c/src/lib/libbsp/arm/smdk2410/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/smdk2410/Makefile.am | 3 ++- 18 files changed, 63 insertions(+), 12 deletions(-) (limited to 'c/src/lib/libbsp/arm') diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index d2d8232357..be45a11951 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-26 Ralf Corsépius * Makefile.am: Cleanup ../../shared/include/bootcard.h handling. diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index e52c1b9a83..3f238dd2ed 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -28,6 +28,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds +noinst_LIBRARIES = libbsp.a + startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \ ../../shared/bsppredriverhook.c startup/bspstart.c ../../shared/bspclean.c \ @@ -44,7 +46,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES) libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index 9eb7cd688f..b9155c3081 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-26 Ralf Corsépius * Makefile.am: Cleanup ../../shared/include/bootcard.h handling. diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index 9ab790315a..f1af03aa62 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -28,6 +28,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds +noinst_LIBRARIES = libbsp.a + startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ ../../shared/bsppretaskinghook.c startup/bspstart.c \ @@ -45,7 +47,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES) libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index 3555c71722..1a98a09445 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-26 Ralf Corsépius * Makefile.am: Cleanup ../../shared/include/bootcard.h handling. diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index d43aebc684..33abce383b 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -29,6 +29,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds +noinst_LIBRARIES = libbsp.a + include_HEADERS += ../../arm/shared/comm/uart.h startup_SOURCES = ../../shared/bsppost.c ../../shared/bsplibc.c \ ../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \ @@ -54,7 +56,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ $(timer_SOURCES) $(abort_SOURCES) $(irq_SOURCES) diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog index 6869bf1e84..168cd1371f 100644 --- a/c/src/lib/libbsp/arm/gba/ChangeLog +++ b/c/src/lib/libbsp/arm/gba/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-26 Ralf Corsépius * Makefile.am: Cleanup ../../shared/include/bootcard.h handling. diff --git a/c/src/lib/libbsp/arm/gba/Makefile.am b/c/src/lib/libbsp/arm/gba/Makefile.am index a29058a4a8..f20635b4cc 100644 --- a/c/src/lib/libbsp/arm/gba/Makefile.am +++ b/c/src/lib/libbsp/arm/gba/Makefile.am @@ -32,6 +32,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds +noinst_LIBRARIES = libbsp.a + # some objects have to be forced together to ensure they are ALWAYS # the ones linked into the application executable. Every application # needs startup/bspstart.c, so we will force in the others @@ -54,7 +56,6 @@ include_HEADERS += irq/irq.h irq_SOURCES = irq/irq.c irq/bsp_irq_init.c irq/irq_init.c \ irq/bsp_irq_asm.S irq/irq_asm.S -noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ $(timer_SOURCES) $(irq_SOURCES) diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog index 46d56139ab..9296c9c9e1 100644 --- a/c/src/lib/libbsp/arm/gp32/ChangeLog +++ b/c/src/lib/libbsp/arm/gp32/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-29 Ralf Corsépius * Makefile.am: Remove noinst_PROGRAMS (Unused). diff --git a/c/src/lib/libbsp/arm/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am index 9eb0bc61c5..80a3e7aa19 100644 --- a/c/src/lib/libbsp/arm/gp32/Makefile.am +++ b/c/src/lib/libbsp/arm/gp32/Makefile.am @@ -28,6 +28,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds +noinst_LIBRARIES = libbsp.a + startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ ../../shared/bsppretaskinghook.c startup/bspstart.c \ @@ -38,7 +40,6 @@ console_SOURCES = console/uart.c ../../shared/console.c abort_SOURCES = ../shared/abort/abort.c smc_SOURCES = smc/smc.c smc/smc.h -noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES) \ $(smc_SOURCES) diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index d41bdcbd17..1303f14fc4 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-26 Ralf Corsépius * Makefile.am: Cleanup ../../shared/include/bootcard.h handling. diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 7ed62633eb..94274729ff 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -44,12 +44,12 @@ EXTRA_DIST = ../shared/start/start.S project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += ../shared/startup/linkcmds.base \ - startup/linkcmds +dist_project_lib_DATA += ../shared/startup/linkcmds.base startup/linkcmds ############################################################################### # LibBSP # ############################################################################### +noinst_LIBRARIES = libbsp.a shared_SOURCES = ../../shared/bootcard.c \ ../../shared/bspclean.c \ @@ -80,8 +80,6 @@ rtc_SOURCES = ../../shared/tod.c \ misc_SOURCES = misc/system-clocks.c -noinst_LIBRARIES = libbsp.a - libbsp_a_SOURCES = $(clock_SOURCES) \ $(console_SOURCES) \ $(irq_SOURCES) \ diff --git a/c/src/lib/libbsp/arm/nds/ChangeLog b/c/src/lib/libbsp/arm/nds/ChangeLog index 8a8a831863..1132727ce4 100644 --- a/c/src/lib/libbsp/arm/nds/ChangeLog +++ b/c/src/lib/libbsp/arm/nds/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-26 Ralf Corsépius * Makefile.am: Cleanup ../../shared/include/bootcard.h handling. diff --git a/c/src/lib/libbsp/arm/nds/Makefile.am b/c/src/lib/libbsp/arm/nds/Makefile.am index 923de78346..d01c9138d0 100644 --- a/c/src/lib/libbsp/arm/nds/Makefile.am +++ b/c/src/lib/libbsp/arm/nds/Makefile.am @@ -30,6 +30,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds +noinst_LIBRARIES = libbsp.a + include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = fb/fb.h touchscreen/touchscreen.h sound/sound.h @@ -257,7 +259,6 @@ coproc.bin: coproc/coproc.S coproc/coproc.c libnds7.rel endif project_lib_DATA += coproc.bin -noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = libbsp_a_LIBADD = clock.rel console.rel gnatsupp.rel startup.rel irq.rel \ timer.rel libnds9.rel rtc.rel fb.rel touchscreen.rel sound.rel \ diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index 5c3f70425e..78b346b281 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-26 Ralf Corsépius * Makefile.am: Cleanup ../../shared/include/bootcard.h handling. diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am index 258c1a5fde..b0e2967543 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am +++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am @@ -29,6 +29,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds +noinst_LIBRARIES = libbsp.a + include_HEADERS += ../../arm/shared/comm/uart.h startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \ @@ -48,7 +50,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) \ $(simple_abort_SOURCES) $(debugio_SOURCES) diff --git a/c/src/lib/libbsp/arm/smdk2410/ChangeLog b/c/src/lib/libbsp/arm/smdk2410/ChangeLog index 8c4a52091d..f85effa800 100644 --- a/c/src/lib/libbsp/arm/smdk2410/ChangeLog +++ b/c/src/lib/libbsp/arm/smdk2410/ChangeLog @@ -1,3 +1,8 @@ +2008-09-29 Ralf Corsépius + + * Makefile.am: Move noinst_LIBRARIES = libbsp.a before its + components. + 2008-09-29 Ralf Corsépius * Makefile.am: Remove noinst_PROGRAMS (Unused). diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index 9c519c2ea4..3a17b7e7a4 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -27,6 +27,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds +noinst_LIBRARIES = libbsp.a + startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../gp32/startup/bspstart.c ../../shared/bspclean.c \ ../gp32/startup/bspreset.c startup/memmap.c \ @@ -38,7 +40,6 @@ console_SOURCES = ../gp32/console/uart.c ../../shared/console.c abort_SOURCES = ../shared/abort/abort.c smc_SOURCES = ../gp32/smc/smc.c ../gp32/smc/smc.h -noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES) \ $(smc_SOURCES) -- cgit v1.2.3