Changeset ac2be677 in rtems


Ignore:
Timestamp:
Jan 29, 2004, 12:24:44 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
ab4f52b
Parents:
ca587d5
Message:

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

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

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sh/simsh4/ChangeLog

    rca587d5 rac2be677  
     12004-01-29      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
     4        startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake
     5        compilation rules.
     6        * clock/Makefile.am, console/Makefile.am, startup/Makefile.am,
     7        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/sh/simsh4/Makefile.am

    rca587d5 rac2be677  
    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 console clock timer wrapup
    13 SUBDIRS += tools
     10EXTRA_PROGRAMS =
     11CLEANFILES =
     12noinst_DATA =
     13
     14SUBDIRS = . tools
    1415
    1516# FIXME: This directory is missing
     
    2021include_HEADERS += include/coverhd.h
    2122
    22 S_FILES = start/start.S
    23 $(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp)
     23EXTRA_DIST = start/start.S
     24start$(LIB_VARIANT).$(OBJEXT): start/start.S
    2425        ${CCASCOMPILE} -DASM -o $@ -c $<
     26project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
    2527
    26 project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
     28dist_project_lib_DATA += startup/linkcmds startup/linkcmds-le \
     29    startup/linkcmds-le.coff
     30
     31EXTRA_PROGRAMS += startup.rel
     32CLEANFILES += startup.rel
     33startup_rel_SOURCES = startup/hw_init.c ../../shared/bsplibc.c \
     34    ../../shared/bsppost.c startup/bspstart.c ../../shared/bspclean.c \
     35    ../../shared/sbrk.c ../../shared/bootcard.c ../../shared/main.c \
     36    ../../shared/gnatinstallhandler.c
     37startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     38startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     39
     40EXTRA_PROGRAMS += startup_g.rel
     41CLEANFILES += startup_g.rel
     42startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     43startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     44startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     45
     46noinst_DATA += startup$(LIB_VARIANT).rel
     47
     48EXTRA_PROGRAMS += console.rel
     49CLEANFILES += console.rel
     50console_rel_SOURCES = console/console.c
     51console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     52console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     53
     54EXTRA_PROGRAMS += console_g.rel
     55CLEANFILES += console_g.rel
     56console_g_rel_SOURCES = $(console_rel_SOURCES)
     57console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     58console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     59
     60noinst_DATA += console$(LIB_VARIANT).rel
     61
     62EXTRA_PROGRAMS += clock.rel
     63CLEANFILES += clock.rel
     64clock_rel_SOURCES = clock/ckinit.c
     65clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     66clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     67
     68EXTRA_PROGRAMS += clock_g.rel
     69CLEANFILES += clock_g.rel
     70clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     71clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     72clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     73
     74noinst_DATA += clock$(LIB_VARIANT).rel
     75
     76EXTRA_PROGRAMS += timer.rel
     77CLEANFILES += timer.rel
     78timer_rel_SOURCES = timer/timer.c
     79timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     80timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     81
     82EXTRA_PROGRAMS += timer_g.rel
     83CLEANFILES += timer_g.rel
     84timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     85timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     86timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     87
     88noinst_DATA += timer$(LIB_VARIANT).rel
     89
     90EXTRA_LIBRARIES = libbsp.a
     91CLEANFILES += libbsp.a
     92libbsp_a_SOURCES =
     93libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
     94    clock$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     95# FIXME: This is missing.
     96# libbsp_a_LIBADD += ramdisk$(LIB_VARIANT).rel
     97libbsp_a_LIBADD += \
     98    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score$(LIB_VARIANT).rel
     99
     100EXTRA_LIBRARIES += libbsp_g.a
     101CLEANFILES += libbsp_g.a
     102libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     103libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     104
     105noinst_DATA += libbsp$(LIB_VARIANT).a
    27106
    28107all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    29 
    30 EXTRA_DIST = $(S_FILES)
    31108
    32109PREINSTALL_DIRS =
     
    45122PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    46123
    47 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     124$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    48125        $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    49126TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    50127
    51 CLEANFILES = $(PREINSTALL_FILES)
     128$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     129        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     130TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
     131
     132$(PROJECT_LIB)/linkcmds-le: startup/linkcmds-le $(PROJECT_LIB)/$(dirstamp)
     133        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds-le
     134TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds-le
     135
     136$(PROJECT_LIB)/linkcmds-le.coff: startup/linkcmds-le.coff $(PROJECT_LIB)/$(dirstamp)
     137        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds-le.coff
     138TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds-le.coff
     139
     140CLEANFILES += $(PREINSTALL_FILES)
    52141DISTCLEANFILES = $(PREINSTALL_DIRS)
    53142CLEANFILES += $(TMPINSTALL_FILES)
    54143
    55 include $(top_srcdir)/../../../../automake/subdirs.am
    56144include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/sh/simsh4/configure.ac

    rca587d5 rac2be677  
    3636
    3737# Explicitly list all Makefiles here
    38 AC_CONFIG_FILES([Makefile
    39 console/Makefile
    40 startup/Makefile
    41 clock/Makefile
    42 timer/Makefile
    43 wrapup/Makefile
    44 ])
     38AC_CONFIG_FILES([Makefile])
    4539AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.