Changeset 5b47c7f in rtems


Ignore:
Timestamp:
Jan 30, 2004, 1:45:14 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
dcbad07
Parents:
7b3de7e
Message:

2004-01-30 Ralf Corsepius <corsepiu@…>

  • Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, network/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules.
  • clock/Makefile.am, console/Makefile.am, network/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
  • configure.ac: Reflect changes above.
Location:
c/src/lib/libbsp/i386
Files:
24 deleted
6 edited

Legend:

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

    r7b3de7e r5b47c7f  
     12004-01-30      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
     4        network/Makefile.am, startup/Makefile.am, timer/Makefile.am,
     5        wrapup/Makefile.am. Use automake compilation rules.
     6        * clock/Makefile.am, console/Makefile.am, network/Makefile.am,
     7        startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
     8        * configure.ac: Reflect changes above.
     9
    1102004-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    211
  • c/src/lib/libbsp/i386/i386ex/Makefile.am

    r7b3de7e r5b47c7f  
    88include $(top_srcdir)/../../bsp.am
    99
    10 # wrapup is the one that actually builds and installs the library
    11 # from the individual .rel files built in other directories
    12 SUBDIRS = . startup clock console timer network wrapup
     10EXTRA_PROGRAMS =
     11CLEANFILES =
     12noinst_DATA =
    1313
    1414include_HEADERS += include/coverhd.h
    1515
    1616noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc
    17 S_FILES = start/start.S
    18 $(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp)
     17EXTRA_DIST = start/start.S
     18start$(LIB_VARIANT).$(OBJEXT): start/start.S
    1919        $(CCASCOMPILE) -DASM -o $@ -c $<
    2020
    21 project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
     21project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     22dist_project_lib_DATA += startup/linkcmds
     23
     24EXTRA_PROGRAMS += startup.rel
     25CLEANFILES += startup.rel
     26startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     27    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     28    ../../shared/main.c ../../shared/sbrk.c ../shared/irq/idt.c \
     29    ../shared/irq/irq.c ../shared/irq/irq_init.c ../shared/comm/i386-stub.c \
     30    ../shared/comm/i386-stub-glue.c ../shared/comm/uart.c \
     31    ../../shared/gnatinstallhandler.c ../shared/comm/gdb_glue.c \
     32    ../shared/comm/tty_drv.c ../shared/irq/irq_asm.S
     33startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     34startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     35
     36EXTRA_PROGRAMS += startup_g.rel
     37CLEANFILES += startup_g.rel
     38startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     39startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     40startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     41
     42noinst_DATA += startup$(LIB_VARIANT).rel
     43
     44EXTRA_PROGRAMS += clock.rel
     45CLEANFILES += clock.rel
     46clock_rel_SOURCES = clock/ckinit.c
     47clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     48clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     49
     50EXTRA_PROGRAMS += clock_g.rel
     51CLEANFILES += clock_g.rel
     52clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     53clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     54clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     55
     56noinst_DATA += clock$(LIB_VARIANT).rel
     57
     58EXTRA_PROGRAMS += console.rel
     59CLEANFILES += console.rel
     60console_rel_SOURCES = console/console.c
     61console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     62console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     63
     64EXTRA_PROGRAMS += console_g.rel
     65CLEANFILES += console_g.rel
     66console_g_rel_SOURCES = $(console_rel_SOURCES)
     67console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     68console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     69
     70noinst_DATA += console$(LIB_VARIANT).rel
     71
     72EXTRA_PROGRAMS += timer.rel
     73CLEANFILES += timer.rel
     74timer_rel_SOURCES = timer/timer.c timer/timerisr.S
     75timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     76timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     77
     78EXTRA_PROGRAMS += timer_g.rel
     79CLEANFILES += timer_g.rel
     80timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     81timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     82timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     83
     84noinst_DATA += timer$(LIB_VARIANT).rel
     85
     86if HAS_NETWORKING
     87EXTRA_PROGRAMS += network.rel
     88CLEANFILES += network.rel
     89network_rel_SOURCES = network/netexterns.h network/network.c \
     90    network/uti596.h
     91network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     92network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     93
     94EXTRA_PROGRAMS += network_g.rel
     95CLEANFILES += network_g.rel
     96network_g_rel_SOURCES = $(network_rel_SOURCES)
     97network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     98network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     99
     100noinst_DATA += network$(LIB_VARIANT).rel
     101endif
     102
     103EXTRA_LIBRARIES = libbsp.a
     104CLEANFILES += libbsp.a
     105libbsp_a_SOURCES =
     106libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
     107    console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     108if HAS_NETWORKING
     109libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     110endif
     111libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \
     112    ../../../libcpu/i386/score$(LIB_VARIANT).rel
     113
     114EXTRA_LIBRARIES += libbsp_g.a
     115CLEANFILES += libbsp_g.a
     116libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     117libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     118
     119noinst_DATA += libbsp$(LIB_VARIANT).a
    22120
    23121all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    30128PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    31129
    32 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     130$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    33131        $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    34132TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    35133
    36 CLEANFILES = $(PREINSTALL_FILES)
     134$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     135        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     136TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
     137
     138CLEANFILES += $(PREINSTALL_FILES)
    37139DISTCLEANFILES = $(PREINSTALL_DIRS)
    38140CLEANFILES += $(TMPINSTALL_FILES)
    39141
    40 include $(top_srcdir)/../../../../automake/subdirs.am
    41142include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/i386/i386ex/configure.ac

    r7b3de7e r5b47c7f  
    1212RTEMS_BSP_CONFIGURE
    1313
    14 RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
     14# RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
     15RTEMS_PROG_CC_FOR_TARGET([-fasm])
    1516RTEMS_CANONICALIZE_TOOLS
    1617RTEMS_PROG_CCAS
     
    2425AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
    2526
    26 
    2727# Explicitly list all Makefiles here
    28 AC_CONFIG_FILES([Makefile
    29 clock/Makefile
    30 console/Makefile
    31 startup/Makefile
    32 timer/Makefile
    33 network/Makefile
    34 wrapup/Makefile])
     28AC_CONFIG_FILES([Makefile])
    3529AC_OUTPUT
  • c/src/lib/libbsp/i386/ts_386ex/ChangeLog

    r7b3de7e r5b47c7f  
     12004-01-30      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
     4        network/Makefile.am, startup/Makefile.am, timer/Makefile.am,
     5        wrapup/Makefile.am. Use automake compilation rules.
     6        * clock/Makefile.am, console/Makefile.am, network/Makefile.am,
     7        startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
     8        * configure.ac: Reflect changes above.
     9
    1102004-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    211
  • c/src/lib/libbsp/i386/ts_386ex/Makefile.am

    r7b3de7e r5b47c7f  
    88include $(top_srcdir)/../../bsp.am
    99
     10EXTRA_PROGRAMS =
     11CLEANFILES =
     12noinst_DATA =
     13
    1014# wrapup is the one that actually builds and installs the library
    1115# from the individual .rel files built in other directories
    12 SUBDIRS = . tools startup clock console timer network wrapup
    13 
    14 if HAS_NETWORKING
    15 include_HEADERS += include/wd80x3.h
    16 endif
     16SUBDIRS = . tools
    1717
    1818include_HEADERS += include/coverhd.h
     
    2020noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc \
    2121    start/ts_1325.inc
    22 S_FILES = start/start.S
    23 $(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp)
     22EXTRA_DIST = start/start.S
     23start$(LIB_VARIANT).$(OBJEXT): start/start.S
    2424        $(CCASCOMPILE) -DASM -o $@ -c $<
    2525
    26 project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
     26project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     27
     28dist_project_lib_DATA += startup/linkcmds
     29
     30EXTRA_PROGRAMS += startup.rel
     31CLEANFILES += startup.rel
     32startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     33    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     34    ../../shared/main.c ../../shared/sbrk.c ../shared/irq/idt.c \
     35    ../shared/irq/irq.c ../shared/irq/irq_init.c ../shared/comm/i386-stub.c \
     36    ../shared/comm/i386-stub-glue.c ../shared/comm/uart.c \
     37    ../../shared/gnatinstallhandler.c ../shared/comm/gdb_glue.c \
     38    ../shared/comm/tty_drv.c ../shared/irq/irq_asm.S
     39startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     40startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     41
     42EXTRA_PROGRAMS += startup_g.rel
     43CLEANFILES += startup_g.rel
     44startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     45startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     46startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     47
     48noinst_DATA += startup$(LIB_VARIANT).rel
     49
     50EXTRA_PROGRAMS += clock.rel
     51CLEANFILES += clock.rel
     52clock_rel_SOURCES = clock/ckinit.c clock/rtc.c
     53clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     54clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     55
     56EXTRA_PROGRAMS += clock_g.rel
     57CLEANFILES += clock_g.rel
     58clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     59clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     60clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     61
     62noinst_DATA += clock$(LIB_VARIANT).rel
     63
     64EXTRA_PROGRAMS += console.rel
     65CLEANFILES += console.rel
     66console_rel_SOURCES = console/console.c
     67console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     68console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     69
     70EXTRA_PROGRAMS += console_g.rel
     71CLEANFILES += console_g.rel
     72console_g_rel_SOURCES = $(console_rel_SOURCES)
     73console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     74console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     75
     76noinst_DATA += console$(LIB_VARIANT).rel
     77
     78EXTRA_PROGRAMS += timer.rel
     79CLEANFILES += timer.rel
     80timer_rel_SOURCES = timer/timer.c timer/timerisr.S
     81timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     82timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     83
     84EXTRA_PROGRAMS += timer_g.rel
     85CLEANFILES += timer_g.rel
     86timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     87timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     88timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     89
     90noinst_DATA += timer$(LIB_VARIANT).rel
     91
     92if HAS_NETWORKING
     93include_HEADERS += include/wd80x3.h
     94
     95# dec21140 is supported via libchip
     96# FIXME: Do we really need these flags?
     97network_CPPFLAGS = -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
     98    -DDIAGNOSTIC -DBOOTP_COMPAT
     99EXTRA_PROGRAMS += network.rel
     100CLEANFILES += network.rel
     101network_rel_SOURCES = network/ne2000.c network/wd80x3.h
     102network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     103    $(network_CPPFLAGS)
     104network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     105
     106EXTRA_PROGRAMS += network_g.rel
     107CLEANFILES += network_g.rel
     108network_g_rel_SOURCES = $(network_rel_SOURCES)
     109network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
     110    $(network_CPPFLAGS)
     111network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     112
     113noinst_DATA += network$(LIB_VARIANT).rel
     114endif
     115
     116EXTRA_LIBRARIES = libbsp.a
     117CLEANFILES += libbsp.a
     118libbsp_a_SOURCES =
     119libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
     120    console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     121if HAS_NETWORKING
     122libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     123endif
     124libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \
     125    ../../../libcpu/i386/score$(LIB_VARIANT).rel
     126
     127EXTRA_LIBRARIES += libbsp_g.a
     128CLEANFILES += libbsp_g.a
     129libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     130libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     131
     132noinst_DATA += libbsp$(LIB_VARIANT).a
    27133
    28134all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    30136PREINSTALL_DIRS =
    31137TMPINSTALL_FILES =
     138
     139$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
     140        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
     141PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
     142
     143$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     144        $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     145TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     146
     147$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     148        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     149TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    32150
    33151if HAS_NETWORKING
     
    37155endif
    38156
    39 $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
    40         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
    41 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    42 
    43 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    44         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    45 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    46 
    47 CLEANFILES = $(PREINSTALL_FILES)
     157CLEANFILES += $(PREINSTALL_FILES)
    48158DISTCLEANFILES = $(PREINSTALL_DIRS)
    49159CLEANFILES += $(TMPINSTALL_FILES)
    50160
    51 include $(top_srcdir)/../../../../automake/subdirs.am
    52161include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/i386/ts_386ex/configure.ac

    r7b3de7e r5b47c7f  
    1212RTEMS_BSP_CONFIGURE
    1313
    14 RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
     14#RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
     15RTEMS_PROG_CC_FOR_TARGET([-fasm])
    1516RTEMS_CANONICALIZE_TOOLS
    1617RTEMS_PROG_CCAS
     
    4041[Enables some debugging in the BSP's uart.])
    4142
    42 
    4343# Explicitly list all Makefiles here
    44 AC_CONFIG_FILES([Makefile
    45 clock/Makefile
    46 console/Makefile
    47 startup/Makefile
    48 timer/Makefile
    49 network/Makefile
    50 wrapup/Makefile])
     44AC_CONFIG_FILES([Makefile])
    5145AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.