Changeset ed8206b in rtems


Ignore:
Timestamp:
Apr 17, 2008, 10:54:45 PM (13 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, 5, master
Children:
f9af0c1
Parents:
8ae91559
Message:

2008-04-17 Joel Sherrill <joel.sherrill@…>

  • Makefile.am: Do not use intermediate .rel files unless from libcpu or a network driver. This simplifies the Makefile.am and avoids pulling in unneeded code.
Location:
c/src/lib/libbsp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i386/pc386/ChangeLog

    r8ae91559 red8206b  
     12008-04-17      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * Makefile.am: Do not use intermediate .rel files unless from libcpu or
     4        a network driver. This simplifies the Makefile.am and avoids pulling
     5        in unneeded code.
     6
    172008-03-22      Joel Sherrill <joel.sherrill@oarcorp.com>
    28
  • c/src/lib/libbsp/i386/pc386/Makefile.am

    r8ae91559 red8206b  
    5555dist_project_lib_DATA += startup/linkcmds
    5656
    57 noinst_PROGRAMS += clock.rel
    58 clock_rel_SOURCES = clock/ckinit.c clock/todcfg.c ../../shared/tod.c
    59 clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    60 clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     57clock_SOURCES = clock/ckinit.c clock/todcfg.c ../../shared/tod.c
    6158
    6259include_rtemsdir = $(includedir)/rtems
     
    6461    console/serial_mouse.h console/ps2_drv.h console/fb_vga.h
    6562
    66 noinst_PROGRAMS += console.rel
    6763include_HEADERS += ../../i386/shared/comm/i386_io.h
    68 console_rel_SOURCES = console/console.c console/inch.c console/outch.c \
     64console_SOURCES = console/console.c console/inch.c console/outch.c \
    6965    console/defkeymap.c console/fb_vga.c console/keyboard.c \
    7066    console/mouse_parser.c console/pc_keyb.c console/ps2_mouse.c \
    7167    console/serial_mouse.c console/vgainit.c console/vt.c console/videoAsm.S \
    7268    ../../i386/shared/comm/uart.c ../../i386/shared/comm/tty_drv.c
    73 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
    74 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7569
    76 noinst_PROGRAMS += gdb.rel
    77 gdb_rel_SOURCES = ../../i386/shared/comm/i386-stub.c \
     70gdb_SOURCES = ../../i386/shared/comm/i386-stub.c \
    7871    ../../i386/shared/comm/i386-stub-glue.c \
    7972    ../../i386/shared/comm/gdb_glue.c
    80 gdb_rel_CPPFLAGS = $(AM_CPPFLAGS)
    81 gdb_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8273
    83 noinst_PROGRAMS += gnat.rel
    84 gnat_rel_SOURCES = ../../shared/gnatinstallhandler.c
    85 gnat_rel_CPPFLAGS = $(AM_CPPFLAGS)
    86 gnat_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     74gnat_SOURCES = ../../shared/gnatinstallhandler.c
    8775
    88 noinst_PROGRAMS += pci.rel
    8976include_HEADERS += ../../i386/shared/pci/pcibios.h
    90 pci_rel_SOURCES = ../../i386/shared/pci/pcibios.c ../../i386/shared/pci/pcibios.h
    91 pci_rel_CPPFLAGS = $(AM_CPPFLAGS)
    92 pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     77pci_SOURCES = ../../i386/shared/pci/pcibios.c \
     78    ../../i386/shared/pci/pcibios.h
    9379
    94 noinst_PROGRAMS += startup.rel
    9580include_HEADERS += ../../i386/shared/comm/uart.h
    96 startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     81startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
    9782    ../../shared/bsppredriverhook.c \
    9883    startup/bspstart.c startup/exit.c ../../i386/shared/irq/idt.c \
     
    10085    ../../shared/bootcard.c ../../shared/sbrk.c \
    10186    startup/ldsegs.S ../../i386/shared/irq/irq_asm.S
    102 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
    103 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    10487
    105 noinst_PROGRAMS += timer.rel
    106 timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    107 timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    108 timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     88timer_SOURCES = timer/timer.c timer/timerisr.S
     89
     90ide_SOURCES = ide/idecfg.c ide/ide.c
    10991
    11092if HAS_NETWORKING
     
    136118endif
    137119
    138 noinst_PROGRAMS += ide.rel
    139 ide_rel_SOURCES = ide/idecfg.c ide/ide.c
    140 ide_rel_CPPFLAGS = $(AM_CPPFLAGS)
    141 ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     120noinst_LIBRARIES = libbsp.a
     121libbsp_a_SOURCES = $(clock_SOURCES) $(console_SOURCES) $(gdb_SOURCES) \
     122    $(gnat_SOURCES) $(pci_SOURCES) $(startup_SOURCES) $(timer_SOURCES) \
     123    $(ide_SOURCES)
    142124
    143 noinst_LIBRARIES = libbsp.a
    144 libbsp_a_SOURCES =
    145 libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel ide.rel \
    146     gdb.rel gnat.rel pci.rel
     125libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel \
     126    ../../../libcpu/@RTEMS_CPU@/page.rel \
     127    ../../../libcpu/@RTEMS_CPU@/score.rel
    147128# We only build the Network library if HAS_NETWORKING was defined
    148129# dec21140 is supported via libchip
     
    150131libbsp_a_LIBADD += ne2000.rel wd8003.rel 3c509.rel
    151132endif
    152 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
    153     ../../../libcpu/@RTEMS_CPU@/page.rel \
    154     ../../../libcpu/@RTEMS_CPU@/score.rel
     133
    155134
    156135EXTRA_DIST += HOWTO README.dec21140 STATUS times_i486dx times_p5
  • c/src/lib/libbsp/powerpc/psim/ChangeLog

    r8ae91559 red8206b  
     12008-04-17      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * Makefile.am: Do not use intermediate .rel files unless from libcpu or
     4        a network driver. This simplifies the Makefile.am and avoids pulling
     5        in unneeded code.
     6
    172008-03-03      Joel Sherrill <joel.sherrill@OARcorp.com>
    28
  • c/src/lib/libbsp/powerpc/psim/Makefile.am

    r8ae91559 red8206b  
    3838dist_project_lib_DATA += startup/linkcmds
    3939
    40 noinst_PROGRAMS += startup.rel
    41 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     40noinst_LIBRARIES = libbsp.a
     41
     42startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     43    startup/bspclean.c ../../shared/bsplibc.c \
    4244    ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
    4345    startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \
    4446    ../../shared/gnatinstallhandler.c
    45 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
    46 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    47 
    48 noinst_PROGRAMS += pclock.rel
    49 pclock_rel_SOURCES = ../shared/clock/p_clock.c
    50 pclock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    51 pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    52 
    53 ## Bulk of Console driver with dependencies that entails
    54 noinst_PROGRAMS += console.rel
    55 console_rel_SOURCES = ../../shared/console-polled.c
    56 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
    57 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    58 
    59 ## used for debug IO and bottom of console polled
    60 noinst_PROGRAMS += consoleio.rel
    61 consoleio_rel_SOURCES = console/console-io.c console/consupp.S
    62 consoleio_rel_CPPFLAGS = $(AM_CPPFLAGS)
    63 consoleio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     47pclock_SOURCES = ../shared/clock/p_clock.c
     48console_SOURCES = ../../shared/console-polled.c
     49debugio_SOURCES = console/console-io.c console/consupp.S
    6450
    6551include_bsp_HEADERS = irq/irq.h
    66 
    67 noinst_PROGRAMS += irq.rel
    68 irq_rel_SOURCES = irq/irq_init.c irq/no_pic.c
    69 irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
    70 irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     52irq_SOURCES = irq/irq_init.c irq/no_pic.c
    7153
    7254EXTRA_DIST += vectors/README
    73 
    74 noinst_PROGRAMS += vectors.rel
    75 vectors_rel_SOURCES = vectors/align_h.S
    76 vectors_rel_CPPFLAGS = $(AM_CPPFLAGS)
    77 vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     55vectors_SOURCES = vectors/align_h.S
    7856
    7957include_bsp_HEADERS += \
     
    8563EXTRA_DIST += shmsupp/README
    8664
    87 noinst_PROGRAMS += shmsupp.rel
    88 shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
    89     shmsupp/mpisr.c
    90 shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS)
    91 shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     65shmdr_SOURCES = \
     66    shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c shmsupp/mpisr.c
    9267endif
    9368
    94 noinst_LIBRARIES = libbsp.a
    95 libbsp_a_SOURCES =
    96 libbsp_a_LIBADD = pclock.rel consoleio.rel console.rel irq.rel vectors.rel
    97 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     69libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \
     70    $(debugio_SOURCES) $(irq_SOURCES) $(vectors_SOURCES) $(shmdr_SOURCES)
     71
     72libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
    9873    ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
    9974    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
     
    10580    ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
    10681
    107 libbsp_a_LIBADD += \
    108 startup_rel-bspclean.o \
    109 startup_rel-bsplibc.o \
    110 startup_rel-bsppost.o \
    111 startup_rel-bsppredriverhook.o \
    112 startup_rel-bspstart.o \
    113 startup_rel-bootcard.o \
    114 startup_rel-sbrk.o \
    115 startup_rel-gnatinstallhandler.o
    116 
    117 if HAS_MP
    118 libbsp_a_LIBADD += shmsupp.rel
    119 endif
    120 
    12182include $(srcdir)/preinstall.am
    12283include $(top_srcdir)/../../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.