Changeset 54df0db in rtems


Ignore:
Timestamp:
Jan 27, 2004, 2:58:55 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
964c8322
Parents:
7f2e47b9
Message:

2004-01-27 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/m68k/gen68340
Files:
5 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/m68k/gen68340/ChangeLog

    r7f2e47b9 r54df0db  
     12004-01-27      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-21      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    211
  • c/src/lib/libbsp/m68k/gen68340/Makefile.am

    r7f2e47b9 r54df0db  
    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 wrapup
     10EXTRA_PROGRAMS =
     11CLEANFILES =
     12noinst_DATA =
    1313
    1414include_HEADERS += include/coverhd.h
     
    1919include_HEADERS += include/m68349.inc
    2020
    21 S_FILES = start/start.S
    22 $(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp)
     21EXTRA_DIST = start/start.S
     22start$(LIB_VARIANT).$(OBJEXT): start/start.S
    2323        $(CCASCOMPILE) -DASM -o $@ -c $<
     24project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
    2425
    25 project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
     26dist_project_lib_DATA += startup/linkcmds
     27
     28EXTRA_PROGRAMS += startup.rel
     29CLEANFILES += startup.rel
     30startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     31    ../../shared/bsppost.c startup/bspstart.c startup/init68340.c \
     32    ../../shared/bootcard.c ../shared/m68kpretaskinghook.c \
     33    ../../shared/main.c ../../shared/sbrk.c ../shared/setvec.c \
     34    startup/dumpanic.c ../../shared/gnatinstallhandler.c
     35startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     36startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     37
     38EXTRA_PROGRAMS += startup_g.rel
     39CLEANFILES += startup_g.rel
     40startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     41startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     42startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     43
     44noinst_DATA += startup$(LIB_VARIANT).rel
     45
     46EXTRA_PROGRAMS += clock.rel
     47CLEANFILES += clock.rel
     48clock_rel_SOURCES = clock/ckinit.c
     49clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     50clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     51
     52EXTRA_PROGRAMS += clock_g.rel
     53CLEANFILES += clock_g.rel
     54clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     55clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     56clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     57
     58noinst_DATA += clock$(LIB_VARIANT).rel
     59
     60EXTRA_PROGRAMS += console.rel
     61CLEANFILES += console.rel
     62console_rel_SOURCES = console/Modif_cpu_asm.S console/console.c \
     63    console/m340uart.c
     64console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     65console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     66
     67EXTRA_PROGRAMS += console_g.rel
     68CLEANFILES += console_g.rel
     69console_g_rel_SOURCES = $(console_rel_SOURCES)
     70console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     71console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     72
     73noinst_DATA += console$(LIB_VARIANT).rel
     74
     75EXTRA_PROGRAMS += timer.rel
     76CLEANFILES += timer.rel
     77timer_rel_SOURCES = timer/timer.c
     78timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     79timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     80
     81EXTRA_PROGRAMS += timer_g.rel
     82CLEANFILES += timer_g.rel
     83timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     84timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     85timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     86
     87noinst_DATA += timer$(LIB_VARIANT).rel
     88
     89EXTRA_LIBRARIES = libbsp.a
     90CLEANFILES += libbsp.a
     91libbsp_a_SOURCES =
     92libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
     93    console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     94libbsp_a_LIBADD += \
     95    ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
     96    ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
     97
     98EXTRA_LIBRARIES += libbsp_g.a
     99CLEANFILES += libbsp_g.a
     100libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     101libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     102
     103noinst_DATA += libbsp$(LIB_VARIANT).a
    26104
    27105all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    54132PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68349.inc
    55133
    56 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     134$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    57135        $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    58136TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    59137
    60 CLEANFILES = $(PREINSTALL_FILES)
     138$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     139        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     140TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
     141
     142CLEANFILES += $(PREINSTALL_FILES)
    61143DISTCLEANFILES = $(PREINSTALL_DIRS)
    62144CLEANFILES += $(TMPINSTALL_FILES)
    63145
    64 include $(top_srcdir)/../../../../automake/subdirs.am
    65146include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/m68k/gen68340/configure.ac

    r7f2e47b9 r54df0db  
    1414RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
    1515RTEMS_CANONICALIZE_TOOLS
     16RTEMS_PROG_CCAS
    1617
    1718# Explicitly list all Makefiles here
    18 AC_CONFIG_FILES([Makefile
    19 clock/Makefile
    20 console/Makefile
    21 startup/Makefile
    22 timer/Makefile
    23 wrapup/Makefile])
     19AC_CONFIG_FILES([Makefile])
    2420AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.