Changeset b0e3d516 in rtems


Ignore:
Timestamp:
02/02/04 10:03:52 (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
36e20a0
Parents:
ed4f16b
Message:

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

  • Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules.
  • clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
  • configure.ac: Reflect changes above.
Location:
c/src/lib/libbsp/i960/cvme961
Files:
14 deleted
3 edited

Legend:

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

    red4f16b rb0e3d516  
     12004-02-02      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
     4        shmsupp/Makefile.am, start/Makefile.am, startup/Makefile.am,
     5        timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules.
     6        * clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am,
     7        start/Makefile.am, startup/Makefile.am, timer/Makefile.am,
     8        wrapup/Makefile.am: Remove.
     9        * configure.ac: Reflect changes above.
     10
    1112004-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    212
  • c/src/lib/libbsp/i960/cvme961/Makefile.am

    red4f16b rb0e3d516  
    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 shmsupp 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 EXTRA_DIST = times
     16EXTRA_DIST = start/start.S
     17start$(LIB_VARIANT).$(OBJEXT): start/start.S
     18        ${CCASCOMPILE} -DASM -o $@ -c $<
     19project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     20
     21dist_project_lib_DATA += startup/linkcmds
     22
     23EXTRA_PROGRAMS += startup.rel
     24CLEANFILES += startup.rel
     25startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     26    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     27    ../../shared/main.c ../../shared/sbrk.c startup/setvec.c \
     28    ../../shared/gnatinstallhandler.c
     29startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     30startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     31
     32EXTRA_PROGRAMS += startup_g.rel
     33CLEANFILES += startup_g.rel
     34startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     35startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     36startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     37
     38noinst_DATA += startup$(LIB_VARIANT).rel
     39
     40EXTRA_PROGRAMS += clock.rel
     41CLEANFILES += clock.rel
     42clock_rel_SOURCES = clock/ckinit.c
     43clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     44clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     45
     46EXTRA_PROGRAMS += clock_g.rel
     47CLEANFILES += clock_g.rel
     48clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     49clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     50clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     51
     52noinst_DATA += clock$(LIB_VARIANT).rel
     53
     54EXTRA_PROGRAMS += console.rel
     55CLEANFILES += console.rel
     56console_rel_SOURCES = console/console.c
     57console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     58console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     59
     60EXTRA_PROGRAMS += console_g.rel
     61CLEANFILES += console_g.rel
     62console_g_rel_SOURCES = $(console_rel_SOURCES)
     63console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     64console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     65
     66noinst_DATA += console$(LIB_VARIANT).rel
     67
     68EXTRA_PROGRAMS += timer.rel
     69CLEANFILES += timer.rel
     70timer_rel_SOURCES = timer/timer.c timer/timerisr.S
     71timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     72timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     73
     74EXTRA_PROGRAMS += timer_g.rel
     75CLEANFILES += timer_g.rel
     76timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     77timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     78timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     79
     80noinst_DATA += timer$(LIB_VARIANT).rel
     81
     82if HAS_MP
     83EXTRA_PROGRAMS += shmsupp.rel
     84CLEANFILES += shmsupp.rel
     85shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
     86    shmsupp/mpisr.c
     87shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     88shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     89
     90EXTRA_PROGRAMS += shmsupp_g.rel
     91CLEANFILES += shmsupp_g.rel
     92shmsupp_g_rel_SOURCES = $(shmsupp_rel_SOURCES)
     93shmsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     94shmsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     95
     96noinst_DATA += shmsupp$(LIB_VARIANT).rel
     97endif
     98
     99EXTRA_LIBRARIES = libbsp.a
     100CLEANFILES += libbsp.a
     101libbsp_a_SOURCES =
     102libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
     103    console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     104if HAS_MP
     105libbsp_a_LIBADD += shmsupp$(LIB_VARIANT).rel
     106endif
     107libbsp_a_LIBADD += \
     108    ../../../../libcpu/@RTEMS_CPU@/i960ca/score$(LIB_VARIANT).rel
     109
     110EXTRA_LIBRARIES += libbsp_g.a
     111CLEANFILES += libbsp_g.a
     112libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     113libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     114
     115noinst_DATA += libbsp$(LIB_VARIANT).a
     116
     117all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     118
     119EXTRA_DIST += times
    18120
    19121PREINSTALL_DIRS =
     122TMPINSTALL_FILES =
    20123
    21 $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
     124$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
    22125        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
    23126PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    24127
    25 CLEANFILES = $(PREINSTALL_FILES)
     128$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     129        $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     130TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     131
     132$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     133        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     134TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
     135
     136CLEANFILES += $(PREINSTALL_FILES)
    26137DISTCLEANFILES = $(PREINSTALL_DIRS)
     138CLEANFILES += $(TMPINSTALL_FILES)
    27139
    28 include $(top_srcdir)/../../../../automake/subdirs.am
    29140include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/i960/cvme961/configure.ac

    red4f16b rb0e3d516  
    1616RTEMS_PROG_CCAS
    1717
    18 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
    19 
    20 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
    21 
    2218# Explicitly list all Makefiles here
    23 AC_CONFIG_FILES([Makefile
    24 clock/Makefile
    25 console/Makefile
    26 shmsupp/Makefile
    27 start/Makefile
    28 startup/Makefile
    29 timer/Makefile
    30 wrapup/Makefile])
     19AC_CONFIG_FILES([Makefile])
    3120AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.