Changeset 5866f81 in rtems


Ignore:
Timestamp:
Jan 29, 2004, 2:17:07 AM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
10026ebf
Parents:
f3c5a0ec
Message:

2004-01-29 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.
Location:
c/src/lib/libbsp/c4x/c4xsim
Files:
6 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/c4x/c4xsim/ChangeLog

    rf3c5a0ec r5866f81  
     12004-01-29      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.
     6        Use automake compilation rules.
     7        * clock/Makefile.am, console/Makefile.am, start/Makefile.am,
     8        startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am:
     9        Remove.
     10        * configure.ac: Reflect changes above.
     11
    1122004-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    213
  • c/src/lib/libbsp/c4x/c4xsim/Makefile.am

    rf3c5a0ec r5866f81  
    77# wrapup is the one that actually builds and installs the library
    88# from the individual .rel files built in other directories
    9 SUBDIRS = . start startup console clock timer wrapup tools
     9SUBDIRS = . tools
    1010
     11include $(top_srcdir)/../../../../automake/compile.am
    1112include $(top_srcdir)/../../bsp.am
    1213
     14EXTRA_PROGRAMS =
     15CLEANFILES =
     16noinst_DATA =
     17
    1318include_HEADERS += include/simio.h
    14 nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
     19nodist_include_HEADERS += ../../shared/include/coverhd.h
    1520
    16 all-local: $(PREINSTALL_FILES)
     21EXTRA_DIST = start/start.S
     22start$(LIB_VARIANT).$(OBJEXT): start/start.S
     23        ${CCASCOMPILE} -DASM -o $@ -c $<
     24project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
    1725
    18 EXTRA_DIST = times
     26dist_project_lib_DATA += startup/linkcmds
     27
     28EXTRA_PROGRAMS += startup.rel
     29CLEANFILES += startup.rel
     30startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     31    ../../shared/bsppost.c startup/bspstart.c ../../shared/main.c \
     32    ../../shared/bootcard.c ../../shared/sbrk.c ../../shared/setvec.c \
     33    ../shared/c3xspurious.c ../shared/c4xspurious.c \
     34    ../shared/bspspuriousinit.c startup/spurious.c \
     35    ../../shared/gnatinstallhandler.c
     36startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     37startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     38
     39EXTRA_PROGRAMS += startup_g.rel
     40CLEANFILES += startup_g.rel
     41startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     42startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     43startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     44
     45noinst_DATA += startup$(LIB_VARIANT).rel
     46
     47EXTRA_PROGRAMS += console.rel
     48CLEANFILES += console.rel
     49console_rel_SOURCES = console/consolereserveresources.c console/debugio.c \
     50    console/simio.c ../../shared/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/clock.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
     96EXTRA_LIBRARIES += libbsp_g.a
     97CLEANFILES += libbsp_g.a
     98libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     99libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     100
     101noinst_DATA += libbsp$(LIB_VARIANT).a
     102
     103all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     104
     105EXTRA_DIST += times
    19106
    20107PREINSTALL_DIRS =
     108TMPINSTALL_FILES =
    21109
    22110$(PROJECT_INCLUDE)/simio.h: include/simio.h $(PROJECT_INCLUDE)/$(dirstamp)
     
    24112PREINSTALL_FILES += $(PROJECT_INCLUDE)/simio.h
    25113
    26 $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
     114$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
    27115        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
    28116PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    29117
    30 CLEANFILES = $(PREINSTALL_FILES)
     118$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     119        $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     120TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     121
     122$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     123        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     124TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
     125
     126CLEANFILES += $(PREINSTALL_FILES)
    31127DISTCLEANFILES = $(PREINSTALL_DIRS)
     128CLEANFILES += $(TMPINSTALL_FILES)
    32129
    33 include $(top_srcdir)/../../../../automake/subdirs.am
    34130include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/c4x/c4xsim/configure.ac

    rf3c5a0ec r5866f81  
    1919
    2020# Explicitly list all Makefiles here
    21 AC_CONFIG_FILES([Makefile
    22 clock/Makefile
    23 console/Makefile
    24 start/Makefile
    25 startup/Makefile
    26 timer/Makefile
    27 wrapup/Makefile])
     21AC_CONFIG_FILES([Makefile])
    2822AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.