diff options
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
22 files changed, 237 insertions, 515 deletions
diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index 00530897c6..b631c04f2a 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am index 2f26a6c642..4c1a6c57e0 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am @@ -23,67 +23,39 @@ include_bspdir = $(includedir)/bsp ### dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspstart.c ../../shared/bootcard.c \ +startup_SOURCES = startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../powerpc/shared/startup/sbrk.c \ ../../shared/bspclean.c ../../shared/gnatinstallhandler.c \ ../../powerpc/shared/startup/pgtbl_setup.c \ ../../powerpc/shared/startup/pgtbl_activate.c \ ../../powerpc/shared/showbats.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c -### include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \ ../../powerpc/shared/motorola/motorola.h \ ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/pnp.h \ ../../powerpc/shared/console/consoleIo.h console/rsPMCQ1.h - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c console/ns16550cfg.c \ +console_SOURCES = console/console.c console/ns16550cfg.c \ console/mc68360_scc.c console/rsPMCQ1.c console/alloc360.c \ console/init68360.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### -include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h -noinst_PROGRAMS += openpic.rel -openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \ +include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h +openpic_SOURCES = ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/openpic/openpic.c -openpic_rel_CPPFLAGS = $(AM_CPPFLAGS) -openpic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \ +pci_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/pcifinddevice.c -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h +irq_SOURCES = irq/irq_init.c ../shared/irq/openpic_i8259_irq.c ../../powerpc/shared/irq/i8259.c -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq_init.c ../shared/irq/openpic_i8259_irq.c ../../powerpc/shared/irq/i8259.c -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ vme/VMEConfig.h \ ../../shared/vmeUniverse/vme_am_defs.h \ @@ -92,16 +64,11 @@ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/bspVmeDmaList.h\ ../../shared/vmeUniverse/VMEDMA.h -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ +vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../shared/vme/vmeconfig.c \ ../shared/vme/vme_universe.c \ ../../shared/vmeUniverse/vme_am_defs.h -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## EXTRA_DIST = start/start.S start.$(OBJEXT): start/start.S @@ -114,11 +81,11 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel console.rel irq.rel openpic.rel pci.rel \ - startup.rel vme.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \ + $(openpic_SOURCES) $(pci_SOURCES) $(irq_SOURCES) $(vme_SOURCES) -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog index b7f69ff5b3..b26275b465 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 711b818498..e167bd2dc5 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -60,74 +60,35 @@ bestcomm_rel_SOURCES = bestcomm/include/ppctypes.h \ bestcomm_rel_CPPFLAGS = $(AM_CPPFLAGS) -DMPC5200_BAPI_LIBC_HEADERS bestcomm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/clock.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += i2c.rel -i2c_rel_SOURCES = i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c \ - i2c/mpc5200mbus.h -i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) -i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += ide.rel -ide_rel_SOURCES = ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h -ide_rel_CPPFLAGS = $(AM_CPPFLAGS) -ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = clock/clock.c +console_SOURCES = console/console.c +i2c_SOURCES = i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h +ide_SOURCES = ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h include_bsp_HEADERS = irq/irq.h include/i2cdrv.h include/mpc5200.h \ include/i2c.h include/u-boot.h +irq_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S +mscan_SOURCES = mscan/mscan.c mscan/mscan.h mscan/mscan_int.h -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += mscan.rel -mscan_rel_SOURCES = mscan/mscan.c mscan/mscan.h mscan/mscan_int.h -mscan_rel_CPPFLAGS = $(AM_CPPFLAGS) -mscan_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += nvram.rel -nvram_rel_SOURCES = nvram/nvram.c nvram/nvram.h nvram/m93cxx.h -nvram_rel_CPPFLAGS = $(AM_CPPFLAGS) -nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += nvram/nvram.h +nvram_SOURCES = nvram/nvram.c nvram/nvram.h nvram/m93cxx.h -noinst_PROGRAMS += slicetimer.rel -slicetimer_rel_SOURCES = slicetimer/slicetimer.c slicetimer/slicetimer.h -slicetimer_rel_CPPFLAGS = $(AM_CPPFLAGS) -slicetimer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += slicetimer/slicetimer.h +slicetimer_SOURCES = slicetimer/slicetimer.c slicetimer/slicetimer.h -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \ +tod_SOURCES = tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \ ../../shared/tod.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += vectors/vectors.h -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../shared/uboot_dump_bdinfo.c \ ../../shared/gnatinstallhandler.c startup/cpuinit.c \ ../shared/showbats.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.h \ +vectors_SOURCES = vectors/vectors_init.c vectors/vectors.h \ vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -139,13 +100,14 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = bestcomm.rel clock.rel console.rel i2c.rel ide.rel irq.rel \ - mscan.rel nvram.rel slicetimer.rel tod.rel startup.rel vectors.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(clock_SOURCES) $(console_SOURCES) $(i2c_SOURCES) \ + $(ide_SOURCES) $(irq_SOURCES) $(mscan_SOURCES) $(nvram_SOURCES) \ + $(slicetimer_SOURCES) $(tod_SOURCES) $(startup_SOURCES) \ + $(vectors_SOURCES) + +libbsp_a_LIBADD = \ + bestcomm.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ @@ -153,5 +115,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog index 586415c09e..6b618fadac 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Refactored and renamed diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index 51917bc4b4..1c60142d68 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am @@ -37,48 +37,23 @@ dist_project_lib_DATA += startup/linkcmds \ startup/linkcmds.mpc8349eamds \ startup/linkcmds.hsc_cm01 -noinst_PROGRAMS += mpc83xx_regs.rel -mpc83xx_regs_rel_SOURCES = startup/mpc83xx_regs.c -mpc83xx_regs_rel_CPPFLAGS = $(AM_CPPFLAGS) -mpc83xx_regs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +mpc83xx_regs_SOURCES = startup/mpc83xx_regs.c +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/cpuinit.c +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -include_bsp_HEADERS = ./irq/irq.h\ - ../../powerpc/shared/vectors/vectors.h - -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors.h \ +include_bsp_HEADERS = ./irq/irq.h \ + ../../powerpc/shared/vectors/vectors.h +vectors_SOURCES = ../../powerpc/shared/vectors/vectors.h \ ../../powerpc/shared/vectors/vectors_init.c \ ../../powerpc/shared/vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = ./irq/irq.h \ - ./irq/irq_init.c \ - ./irq/ipic.c \ +irq_SOURCES = ./irq/irq.h ./irq/irq_init.c ./irq/ipic.c \ ../shared/irq/irq_asm.S - -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c console/ns16550cfg.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = console/console.c console/ns16550cfg.c +bsp_i2c_SOURCES = i2c/i2c_init.c +bsp_spi_SOURCES = spi/spi_init.c if HAS_NETWORKING noinst_PROGRAMS += network.rel @@ -88,22 +63,13 @@ network_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -D__BSD_VISIBLE network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -noinst_PROGRAMS += bsp_i2c.rel -bsp_i2c_rel_SOURCES = i2c/i2c_init.c -bsp_i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) -bsp_i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += bsp_spi.rel -bsp_spi_rel_SOURCES = spi/spi_init.c -bsp_spi_rel_CPPFLAGS = $(AM_CPPFLAGS) -bsp_spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - - noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel pclock.rel console.rel vectors.rel irq.rel \ - mpc83xx_regs.rel bsp_i2c.rel bsp_spi.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \ + $(vectors_SOURCES) $(irq_SOURCES) $(mpc83xx_regs_SOURCES) \ + $(bsp_i2c_SOURCES) $(bsp_spi_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index a68415e8d1..043f6da661 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c, startup/bspstart.c.nocache: Refactored and diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index 200c2c1855..43d52f0a5b 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am @@ -27,40 +27,17 @@ EXTRA_DIST = times-mbx821 times-mbx860 dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/irq_asm.S irq/irq_init.c -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += ide.rel -ide_rel_SOURCES = ide/idecfg.c ide/pcmcia_ide.c -ide_rel_CPPFLAGS = $(AM_CPPFLAGS) -ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = vectors/vectors.h vectors/vectors_init.c \ +pclock_SOURCES = clock/p_clock.c +console_SOURCES = console/console.c +irq_SOURCES = irq/irq.c irq/irq_asm.S irq/irq_init.c +ide_SOURCES = ide/idecfg.c ide/pcmcia_ide.c +vectors_SOURCES = vectors/vectors.h vectors/vectors_init.c \ vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c \ startup/imbx8xx.c startup/mmutlbtab.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/start.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -71,15 +48,11 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = - -libbsp_a_LIBADD = pclock.rel irq.rel ide.rel startup.rel console.rel \ - vectors.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif +libbsp_a_SOURCES = $(pclock_SOURCES) $(irq_SOURCES) $(ide_SOURCES) \ + $(startup_SOURCES) $(console_SOURCES) $(vectors_SOURCES) -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ @@ -89,5 +62,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8xx/timer.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 7760df34a7..145df11177 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2007-12-11 Till Straumann <strauman@slac.stanford.edu> * Makefile.am: use new irq_bspsupport.rel which was diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 43f14e0a30..86c3dab9ec 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -42,11 +42,9 @@ vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA += vectors_entry.$(OBJEXT) - dist_project_lib_DATA += ../shared/startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../powerpc/shared/startup/bspstart.c \ +startup_SOURCES = ../../powerpc/shared/startup/bspstart.c \ ../../powerpc/shared/showbats.c \ ../../powerpc/shared/startup/pretaskinghook.c \ ../../shared/bsppredriverhook.c \ @@ -56,25 +54,20 @@ startup_rel_SOURCES = ../../powerpc/shared/startup/bspstart.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +tod_SOURCES = ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c include_bsp_HEADERS = ../../powerpc/shared/console/consoleIo.h include_bsp_HEADERS += ../../powerpc/shared/console/uart.h -console_CPPFLAGS = -DSTATIC_LOG_ALLOC -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../powerpc/shared/console/polled_io.c \ +# Needs conditional compilation +polledIO_CPPFLAGS = -DSTATIC_LOG_ALLOC +noinst_PROGRAMS += polledIO.rel +polledIO_rel_SOURCES = ../../powerpc/shared/console/polled_io.c +polledIO_rel_CPPFLAGS = $(AM_CPPFLAGS) $(polledIO_CPPFLAGS) +polledIO_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +console_SOURCES = \ ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ ../../powerpc/shared/console/inch.c \ @@ -82,57 +75,36 @@ console_rel_SOURCES = ../../powerpc/shared/console/polled_io.c \ ../../powerpc/shared/console/consoleIo.h \ ../../powerpc/shared/console/keyboard.h \ ../../powerpc/shared/console/uart.h -console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(console_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = ../../powerpc/shared/irq/irq_init.c ../../powerpc/shared/irq/openpic_i8259_irq.c \ +irq_SOURCES = ../../powerpc/shared/irq/irq_init.c \ + ../../powerpc/shared/irq/openpic_i8259_irq.c \ ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.h -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h - -noinst_PROGRAMS += motorola.rel -motorola_rel_SOURCES = ../../powerpc/shared/motorola/motorola.h \ +motorola_SOURCES = ../../powerpc/shared/motorola/motorola.h \ ../../powerpc/shared/motorola/motorola.c -motorola_rel_CPPFLAGS = $(AM_CPPFLAGS) -motorola_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h - -noinst_PROGRAMS += openpic.rel -openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \ +openpic_SOURCES = ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/openpic/openpic.c \ ../../powerpc/shared/openpic/openpic.h -openpic_rel_CPPFLAGS = $(AM_CPPFLAGS) -openpic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = ../../powerpc/shared/pci/pci.c \ +pci_SOURCES = ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/detect_raven_bridge.c \ ../../powerpc/shared/pci/generic_clear_hberrs.c \ ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/pnp.h - -noinst_PROGRAMS += residual.rel -residual_rel_SOURCES = ../../powerpc/shared/residual/pnp.h \ +residual_SOURCES = ../../powerpc/shared/residual/pnp.h \ ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/residual.c -residual_rel_CPPFLAGS = $(AM_CPPFLAGS) -residual_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ @@ -141,9 +113,7 @@ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vmeUniverseDMA.h\ ../../shared/vmeUniverse/bspVmeDmaList.h\ ../../shared/vmeUniverse/VMEDMA.h - -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ +vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ @@ -151,14 +121,15 @@ vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../powerpc/shared/vme/vmeconfig.c \ ../../powerpc/shared/vme/vme_universe.c \ ../../powerpc/shared/vme/VMEConfig.h -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel pclock.rel console.rel irq.rel openpic.rel \ - pci.rel residual.rel motorola.rel tod.rel vme.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \ + $(irq_SOURCES) $(openpic_SOURCES) $(pci_SOURCES) $(residual_SOURCES) \ + $(motorola_SOURCES) $(tod_SOURCES) $(vme_SOURCES) + +libbsp_a_LIBADD = \ + polledIO.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index 30b8739aee..0e70b7ffc3 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index d901569f5b..432700858d 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -28,38 +28,20 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +pclock_SOURCES = clock/p_clock.c +console_SOURCES = console/console.c include_bsp_HEADERS = irq/irq.h - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +irq_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S include_bsp_HEADERS += vectors/vectors.h - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c startup/cpuinit.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.h \ +vectors_SOURCES = vectors/vectors_init.c vectors/vectors.h \ vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -71,12 +53,10 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel irq.rel startup.rel console.rel vectors.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(irq_SOURCES) $(startup_SOURCES) \ + $(console_SOURCES) $(vectors_SOURCES) + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/clock.rel \ @@ -85,6 +65,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif EXTRA_DIST += times diff --git a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog index 7b73108ba3..91c34e4d2c 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-10 Till Straumann <strauman@slac.stanford.edu> * network/tsec.c: removed memory input/output operands diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am index e94b3e7a15..05e9b162ed 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am @@ -39,7 +39,8 @@ EXTRA_DIST += ../shared/start/vectors_entry.S vectors_entry.$(OBJEXT): ../shared/start/vectors_entry.S $(CPPASCOMPILE) -o $@ -c $< -motld_start.$(OBJEXT): preload.$(OBJEXT) vectors_entry.$(OBJEXT) start.$(OBJEXT) +motld_start.$(OBJEXT): preload.$(OBJEXT) vectors_entry.$(OBJEXT) \ + start.$(OBJEXT) $(LD) -o $@ -r $^ project_lib_DATA += motld_start.$(OBJEXT) @@ -55,63 +56,37 @@ build_date.c:: echo 'const char *BSP_build_date="'`date`'";' > $@ noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ./startup/bspstart.c build_date.c \ +startup_SOURCES = ./startup/bspstart.c build_date.c \ ./startup/misc.c \ ../../powerpc/shared/startup/pretaskinghook.c \ ../../powerpc/shared/startup/zerobss.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = ../../shared/tod.c tod/todcfg.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +tod_SOURCES = ../../shared/tod.c tod/todcfg.c +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c include_bsp_HEADERS = ../../powerpc/shared/console/uart.h -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../powerpc/shared/console/uart.c \ +console_SOURCES = ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ ../../powerpc/shared/console/consoleIo.h \ ../../powerpc/shared/console/uart.h -console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(console_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ./irq/irq.h - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = ./irq/irq_init.c ../../powerpc/shared/irq/openpic_i8259_irq.c \ +irq_SOURCES = ./irq/irq_init.c \ + ../../powerpc/shared/irq/openpic_i8259_irq.c \ ../../powerpc/shared/irq/irq.h -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h - -noinst_PROGRAMS += openpic.rel -openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \ +openpic_SOURCES = ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/openpic/openpic.c \ ../../powerpc/shared/openpic/openpic.h -openpic_rel_CPPFLAGS = $(AM_CPPFLAGS) -openpic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = ../../powerpc/shared/pci/pci.c \ +pci_SOURCES = ../../powerpc/shared/pci/pci.c \ ./pci/detect_host_bridge.c \ ../../powerpc/shared/pci/generic_clear_hberrs.c \ ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h include_bsp_HEADERS += ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h @@ -125,8 +100,7 @@ include_bsp_HEADERS += ./vme/VMEConfig.h \ ../../shared/vmeUniverse/bspVmeDmaList.h\ ../../shared/vmeUniverse/VMEDMA.h -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeTsi148.c \ +vme_SOURCES = ../../shared/vmeUniverse/vmeTsi148.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../../shared/vmeUniverse/vmeTsi148.h \ ../../shared/vmeUniverse/vme_am_defs.h \ @@ -134,46 +108,32 @@ vme_rel_SOURCES = ../../shared/vmeUniverse/vmeTsi148.c \ ../../powerpc/shared/vme/vmeconfig.c \ ../../powerpc/shared/vme/vme_universe.c -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - include_bsp_HEADERS += ../shared/flash/flashPgm.h \ ../shared/flash/flashPgmPvt.h - -noinst_PROGRAMS += flash.rel -flash_rel_SOURCES = ../shared/flash/flash.c \ +flash_SOURCES = ../shared/flash/flash.c \ ../shared/flash/spansionFlash.c \ ./flash/flashcfg.c -flash_rel_CPPFLAGS = $(AM_CPPFLAGS) -flash_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - - include_bsp_HEADERS += i2c/mpc8540_i2c_busdrv.h -noinst_PROGRAMS += i2c.rel -i2c_rel_SOURCES = i2c/mpc8540_i2c.c i2c/i2c_init.c -i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) -i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +i2c_SOURCES = i2c/mpc8540_i2c.c i2c/i2c_init.c include_bsp_HEADERS += ../shared/motorola/vpd.h -noinst_PROGRAMS += vpd.rel -vpd_rel_SOURCES = ../shared/motorola/vpd.c -vpd_rel_CPPFLAGS = $(AM_CPPFLAGS) -vpd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +vpd_SOURCES = ../shared/motorola/vpd.c +if HAS_NETWORKING include_bsp_HEADERS += network/if_tsec_pub.h noinst_PROGRAMS += network.rel network_rel_SOURCES = network/tsec.c network_rel_CPPFLAGS = $(AM_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - +endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel pclock.rel console.rel openpic.rel \ - pci.rel irq.rel i2c.rel tod.rel vpd.rel network.rel vme.rel flash.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \ + $(openpic_SOURCES) $(pci_SOURCES) $(irq_SOURCES) $(i2c_SOURCES) \ + $(tod_SOURCES) $(vpd_SOURCES) $(vme_SOURCES) $(flash_SOURCES) -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \ ../../../libcpu/@RTEMS_CPU@/e500/timer.rel \ @@ -183,6 +143,10 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + EXTRA_DIST += LICENSE ChangeLog README KNOWN_PROBLEMS include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index 539bb9b73d..7c274fd0dd 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index 98827640c2..d9d29f1847 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -29,83 +29,53 @@ dist_project_lib_DATA += ../shared/startup/linkcmds # UNUSED EXTRA_DIST = startup/bootpstuff.c -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspstart.c \ +startup_SOURCES = startup/bspstart.c \ ../../powerpc/shared/startup/pgtbl_setup.c startup/pgtbl_activate.c \ ../../powerpc/shared/startup/pretaskinghook.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c startup/bspclean.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/gnatinstallhandler.c startup/reboot.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c -### -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### include_bsp_HEADERS = ../../powerpc/shared/console/uart.h include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../powerpc/shared/console/uart.c \ +console_SOURCES = ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS += pci/gtpcireg.h pci/pci.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = pci/pci.c pci/pci_interface.c pci/detect_host_bridge.c \ +pci_SOURCES = pci/pci.c pci/pci_interface.c pci/detect_host_bridge.c \ pci/pcifinddevice.c -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS += irq/irq.h +irq_SOURCES = irq/irq_init.c irq/irq.c -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq_init.c irq/irq.c -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### nodist_include_HEADERS += ../../shared/tod.h +tod_SOURCES = ../../shared/tod.c tod/todcfg.c -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = ../../shared/tod.c tod/todcfg.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## -include_bsp_HEADERS += \ - vectors/bspException.h - +include_bsp_HEADERS += vectors/bspException.h include_bsp_HEADERS += \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = \ - vectors/exceptionhandler.c \ +vectors_SOURCES = vectors/exceptionhandler.c \ ../../powerpc/shared/start/vectors_entry.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -## include_bsp_HEADERS += GT64260/bspMvme5500.h GT64260/gtreg.h \ GT64260/GT64260TWSI.h GT64260/VPD.h -noinst_PROGRAMS += GT64260.rel -GT64260_rel_SOURCES = GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c -GT64260_rel_CPPFLAGS = $(AM_CPPFLAGS) -GT64260_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +GT64260_SOURCES = GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c + +include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h \ + ../../shared/vmeUniverse/vmeUniverse.h \ + ../../shared/vmeUniverse/vmeUniverseDMA.h\ + ../../shared/vmeUniverse/bspVmeDmaList.h\ + ../../shared/vmeUniverse/VMEDMA.h \ + ../../shared/vmeUniverse/vme_am_defs.h +vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c\ + ../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\ + ../shared/vme/vme_universe.c -## if HAS_NETWORKING include_bsp_HEADERS += network/if_100MHz/GT64260eth.h \ network/if_100MHz/GT64260ethreg.h network/if_1GHz/if_wmreg.h \ @@ -118,23 +88,6 @@ network_rel_SOURCES = network/if_100MHz/GT64260eth.c \ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -##vme -include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h \ - ../../shared/vmeUniverse/vmeUniverse.h \ - ../../shared/vmeUniverse/vmeUniverseDMA.h\ - ../../shared/vmeUniverse/bspVmeDmaList.h\ - ../../shared/vmeUniverse/VMEDMA.h \ - ../../shared/vmeUniverse/vme_am_defs.h - -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c\ - ../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\ - ../shared/vme/vme_universe.c - -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S @@ -149,14 +102,12 @@ mvme5500start___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS) project_lib_DATA += mvme5500start.$(OBJEXT) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel console.rel irq.rel pci.rel startup.rel tod.rel \ - vectors.rel GT64260.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += vme.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(irq_SOURCES) \ + $(pci_SOURCES) $(startup_SOURCES) $(tod_SOURCES) $(vectors_SOURCES) \ + $(GT64260_SOURCES) $(vme_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ @@ -166,6 +117,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 74296c585e..d40af469bf 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-04-23 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am: Remove all references to console_reserve_resources and diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index f9766c9517..6ac8bc5c97 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -25,81 +25,43 @@ include_HEADERS += include/coverhd.h include/gen2.h ### dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c startup/Hwr_init.c \ startup/genpvec.c ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### -### include_bsp_HEADERS = - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/85c30.c console/85c30.h console/console.c \ +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c +console_SOURCES = console/85c30.c console/85c30.h console/console.c \ console/tbl85c30.c console/consolebsp.h -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS = ../../powerpc/shared/pci/pci.h \ ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/pnp.h \ ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/console/consoleIo.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \ +pci_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/pcifinddevice.c -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS += irq/irq.h +irq_SOURCES = irq/FPGA.c irq/irq.c ../../powerpc/shared/irq/irq_asm.S -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/FPGA.c irq/irq.c ../../powerpc/shared/irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h - -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors_init.c \ +vectors_SOURCES = ../../powerpc/shared/vectors/vectors_init.c \ ../../powerpc/shared/vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -## include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ ../../shared/vmeUniverse/VME.h \ vme/VMEConfig.h \ ../../powerpc/shared/motorola/motorola.h \ - ../../shared/vmeUniverse/vmeUniverseDMA.h\ - ../../shared/vmeUniverse/bspVmeDmaList.h\ - ../../shared/vmeUniverse/VMEDMA.h - -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ + ../../shared/vmeUniverse/vmeUniverseDMA.h\ + ../../shared/vmeUniverse/bspVmeDmaList.h\ + ../../shared/vmeUniverse/VMEDMA.h +vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../../shared/vmeUniverse/vme_am_defs.h \ ../shared/vme/vmeconfig.c \ ../shared/vme/vme_universe.c -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## - EXTRA_DIST = start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< @@ -111,10 +73,11 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel console.rel irq.rel pci.rel vectors.rel \ - startup.rel vme.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(irq_SOURCES) \ + $(pci_SOURCES) $(vectors_SOURCES) $(startup_SOURCES) $(vme_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog index 2ecfd7287c..2be951494b 100644 --- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am index 2238395f24..0620a1da6f 100644 --- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am @@ -26,33 +26,20 @@ EXTRA_DIST = times dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +pclock_SOURCES = clock/p_clock.c +console_SOURCES = console/console.c +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c startup/iss555.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/start.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += tm27supp.rel -tm27supp_rel_SOURCES = startup/tm27supp.c -tm27supp_rel_CPPFLAGS = $(AM_CPPFLAGS) -tm27supp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +tm27supp_SOURCES = startup/tm27supp.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel console.rel startup.rel tm27supp.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(startup_SOURCES) \ + $(tm27supp_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc5xx/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mpc5xx/console-generic.rel \ diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog index 9bd91d1437..69b6e8d318 100644 --- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog +++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile.am, startup/bspstart.c: Refactored and renamed diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am index 7265c7ea72..9c56184b42 100644 --- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am @@ -32,45 +32,24 @@ project_lib_DATA = rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c \ ../../shared/sbrk.c startup/setvec.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += dlentry.rel -dlentry_rel_SOURCES = dlentry/dlentry.S -dlentry_rel_CPPFLAGS = $(AM_CPPFLAGS) -dlentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += bspconsole.rel -bspconsole_rel_SOURCES = console/consolelite.c ../../shared/console.c -bspconsole_rel_CPPFLAGS = $(AM_CPPFLAGS) -bspconsole_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +dlentry_SOURCES = dlentry/dlentry.S +bspconsole_SOURCES = console/consolelite.c ../../shared/console.c include_bsp_HEADERS = include/opbintctrl.h -noinst_PROGRAMS += opbintctrl.rel -opbintctrl_rel_SOURCES = opbintctrl/opbintctrl.c -opbintctrl_rel_CPPFLAGS = $(AM_CPPFLAGS) -opbintctrl_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +opbintctrl_SOURCES = opbintctrl/opbintctrl.c include_bsp_HEADERS += irq/irq.h -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq_init.c ../shared/irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +irq_SOURCES = irq/irq_init.c ../shared/irq/irq_asm.S include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors.h \ +vectors_SOURCES = ../../powerpc/shared/vectors/vectors.h \ ../../powerpc/shared/vectors/vectors_init.c \ ../../powerpc/shared/vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -82,21 +61,22 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = +libbsp_a_SOURCES = $(startup_SOURCES) $(dlentry_SOURCES) \ + $(bspconsole_SOURCES) $(opbintctrl_SOURCES) $(vectors_SOURCES) \ + $(irq_SOURCES) -libbsp_a_LIBADD = startup.rel dlentry.rel bspconsole.rel opbintctrl.rel \ - vectors.rel irq.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif - -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ ../../../libcpu/@RTEMS_CPU@/ppc403/tty_drv.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + EXTRA_DIST += times include $(srcdir)/preinstall.am |