Changeset 2a85ea23 in rtems


Ignore:
Timestamp:
02/02/04 16:27:47 (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
477180fa
Parents:
076a012
Message:

2004-02-02 Ralf Corsepius <corsepiu@…>

  • Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules.
  • clock/Makefile.am, console/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
  • configure.ac: Reflect changes above.
  • bsp_specs: Sync with other BSPs, fixup missing brace.
Location:
c/src/lib/libbsp/i960/rxgen960
Files:
12 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i960/rxgen960/ChangeLog

    r076a012 r2a85ea23  
     12004-02-02      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
     4        start/Makefile.am, startup/Makefile.am, timer/Makefile.am,
     5        wrapup/Makefile.am. Use automake compilation rules.
     6        * clock/Makefile.am, console/Makefile.am, start/Makefile.am,
     7        startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
     8        * configure.ac: Reflect changes above.
     9        * bsp_specs: Sync with other BSPs, fixup missing brace.
     10
    1112004-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    212
  • c/src/lib/libbsp/i960/rxgen960/Makefile.am

    r076a012 r2a85ea23  
    55ACLOCAL_AMFLAGS = -I ../../../../aclocal
    66
    7 # wrapup is the one that actually builds and installs the library
    8 # from the individual .rel files built in other directories
    9 SUBDIRS = . start startup clock console timer wrapup
    10 
     7include $(top_srcdir)/../../../../automake/compile.am
    118include $(top_srcdir)/../../bsp.am
    129
    13 nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
     10EXTRA_PROGRAMS =
     11CLEANFILES =
     12noinst_DATA =
    1413
    15 all-local: $(PREINSTALL_FILES)
     14nodist_include_HEADERS += ../../shared/include/coverhd.h
    1615
    17 noinst_HEADERS = include/rxgen960_config.h
     16# FIXME: this file should be called start.S
     17EXTRA_DIST = start/rxgen_romld.S
     18rxgen_romld$(LIB_VARIANT).$(OBJEXT): start/rxgen_romld.S
     19        ${CCASCOMPILE} -DASM -o $@ -c $<
     20project_lib_DATA = rxgen_romld$(LIB_VARIANT).$(OBJEXT)
     21
     22dist_project_lib_DATA += startup/linkcmds startup/linkcmds.real \
     23startup/rom.ld
     24
     25EXTRA_PROGRAMS += clock.rel
     26CLEANFILES += clock.rel
     27clock_rel_SOURCES = clock/ckinit.c
     28clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     29clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     30
     31EXTRA_PROGRAMS += clock_g.rel
     32CLEANFILES += clock_g.rel
     33clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     34clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     35clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     36
     37noinst_DATA += clock$(LIB_VARIANT).rel
     38
     39EXTRA_PROGRAMS += console.rel
     40CLEANFILES += console.rel
     41console_rel_SOURCES = console/concntl.h console/console.c console/serial.c \
     42    console/serial.h
     43console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     44console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     45
     46EXTRA_PROGRAMS += console_g.rel
     47CLEANFILES += console_g.rel
     48console_g_rel_SOURCES = $(console_rel_SOURCES)
     49console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     50console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     51
     52noinst_DATA += console$(LIB_VARIANT).rel
     53
     54EXTRA_PROGRAMS += startup.rel
     55CLEANFILES += startup.rel
     56startup_rel_SOURCES = include/rxgen960_config.h startup/asmfault.h \
     57    startup/asmfault.S startup/asmstub.h startup/asmstub.S \
     58    ../../shared/bootcard.c ../../shared/bspclean.c ../../shared/bsplibc.c \
     59    ../../shared/bsppost.c startup/bspstart.c startup/cntrltbl.c \
     60    startup/cntrltbl.h startup/exit.c startup/fault.c startup/fault.h \
     61    startup/faultret.h startup/flttbl.c startup/flttbl.h startup/frmstr.c \
     62    startup/frmstr.h startup/i960.h startup/ihandler.h startup/ihandler.S \
     63    startup/intrtbl.c startup/intrtbl.h startup/kkprintf.c \
     64    ../../shared/main.c startup/main.h startup/memchnl.h startup/nmi.c \
     65    startup/nulsystbl.c startup/pmc901_memmap.h startup/prcb.c \
     66    startup/prcb.h startup/rom_cntrltbl.c startup/rom_ibr.c \
     67    startup/rom_ibr.h startup/rommon.h startup/rom_prcb.c \
     68    ../../shared/sbrk.c startup/sctns.c startup/sctns.h startup/setvec.c \
     69    startup/systbl.c startup/systbl.h startup/time.h
     70startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     71startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     72
     73EXTRA_PROGRAMS += startup_g.rel
     74CLEANFILES += startup_g.rel
     75startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     76startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     77startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     78
     79noinst_DATA += startup$(LIB_VARIANT).rel
     80
     81EXTRA_PROGRAMS += timer.rel
     82CLEANFILES += timer.rel
     83timer_rel_SOURCES = timer/timer.c
     84UNUSED_FILES = timer/timerisr.S
     85timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     86timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     87
     88EXTRA_PROGRAMS += timer_g.rel
     89CLEANFILES += timer_g.rel
     90timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     91timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     92timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     93
     94noinst_DATA += timer$(LIB_VARIANT).rel
     95
     96EXTRA_LIBRARIES = libbsp.a
     97CLEANFILES += libbsp.a
     98libbsp_a_SOURCES =
     99libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
     100    console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     101libbsp_a_LIBADD += \
     102    ../../../libcpu/@RTEMS_CPU@/i960rp/score$(LIB_VARIANT).rel
     103
     104EXTRA_LIBRARIES += libbsp_g.a
     105CLEANFILES += libbsp_g.a
     106libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     107libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     108
     109noinst_DATA += libbsp$(LIB_VARIANT).a
     110
     111all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    18112
    19113PREINSTALL_DIRS =
     114TMPINSTALL_FILES =
    20115
    21 $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
     116$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
    22117        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
    23118PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    24119
    25 CLEANFILES = $(PREINSTALL_FILES)
     120$(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT): rxgen_romld$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     121        $(INSTALL_DATA) $< $(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
     122TMPINSTALL_FILES += $(PROJECT_LIB)/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
     123
     124$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     125        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     126TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
     127
     128CLEANFILES += $(PREINSTALL_FILES)
    26129DISTCLEANFILES = $(PREINSTALL_DIRS)
     130CLEANFILES += $(TMPINSTALL_FILES)
    27131
    28 include $(top_srcdir)/../../../../automake/subdirs.am
    29132include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/i960/rxgen960/bsp_specs

    r076a012 r2a85ea23  
    44
    55*startfile:
    6 %{!qrtems: %(old_startfile)} \
    7 %{qrtems: %{qrtems_debug: rxgen_romld_g.o%s} %{!qrtems_debug: rxgen_romld.o%s}}}
     6%{!qrtems: %(old_startfile)}  %{!nostdlib: %{qrtems: \
     7%{!qrtems_debug: rxgen_romld.o%s} \
     8%{qrtems_debug: rxgen_romld_g.o%s}}}
    89
    910*link:
  • c/src/lib/libbsp/i960/rxgen960/configure.ac

    r076a012 r2a85ea23  
    1717
    1818# Explicitly list all Makefiles here
    19 AC_CONFIG_FILES([Makefile
    20 clock/Makefile
    21 console/Makefile
    22 start/Makefile
    23 startup/Makefile
    24 timer/Makefile
    25 wrapup/Makefile])
     19AC_CONFIG_FILES([Makefile])
    2620AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.