Changeset 9e541e3 in rtems


Ignore:
Timestamp:
Jan 28, 2004, 9:29:43 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
1531b7f1
Parents:
f0d5e5b
Message:

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

  • Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, network/Makefile.am, irq/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules.
  • clock/Makefile.am, console/Makefile.am, network/Makefile.am, irq/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/arm/edb7312
Files:
8 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/edb7312/ChangeLog

    rf0d5e5b r9e541e3  
     12004-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
     4        network/Makefile.am, irq/Makefile.am, start/Makefile.am,
     5        startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake
     6        compilation rules.
     7        * clock/Makefile.am, console/Makefile.am, network/Makefile.am,
     8        irq/Makefile.am, start/Makefile.am, startup/Makefile.am,
     9        timer/Makefile.am, wrapup/Makefile.am: Remove.
     10        * configure.ac: Reflect changes above.
     11
    1122004-01-21      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    213
  • c/src/lib/libbsp/arm/edb7312/Makefile.am

    rf0d5e5b r9e541e3  
    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 = . clock console irq startup timer start network wrapup
    10 
     7include $(top_srcdir)/../../../../automake/compile.am
    118include $(top_srcdir)/../../bsp.am
    129
     10EXTRA_PROGRAMS =
     11CLEANFILES =
     12noinst_DATA =
     13
    1314include_HEADERS += include/ep7312.h
     15nodist_include_HEADERS += ../../shared/include/coverhd.h
    1416
    15 nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
     17EXTRA_DIST = start/start.S
     18start$(LIB_VARIANT).$(OBJEXT): start/start.S
     19        ${CCASCOMPILE} -DASM -o $@ -c $<
     20project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
    1621
    17 all-local: $(PREINSTALL_FILES)
     22dist_project_lib_DATA += startup/linkcmds
     23
     24EXTRA_PROGRAMS += startup.rel
     25CLEANFILES += startup.rel
     26startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     27    startup/bspstart.c startup/exit.c ../../shared/bootcard.c \
     28    ../../shared/main.c ../../shared/sbrk.c \
     29    ../../shared/gnatinstallhandler.c
     30startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     31startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     32
     33EXTRA_PROGRAMS += startup_g.rel
     34CLEANFILES += startup_g.rel
     35startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     36startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     37startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     38
     39noinst_DATA += startup$(LIB_VARIANT).rel
     40
     41EXTRA_PROGRAMS += clock.rel
     42CLEANFILES += clock.rel
     43clock_rel_SOURCES = clock/clockdrv.c
     44clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     45clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     46
     47EXTRA_PROGRAMS += clock_g.rel
     48CLEANFILES += clock_g.rel
     49clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     50clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     51clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     52
     53noinst_DATA += clock$(LIB_VARIANT).rel
     54
     55EXTRA_PROGRAMS += console.rel
     56CLEANFILES += console.rel
     57console_rel_SOURCES = console/uart.c ../../shared/console.c
     58console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     59console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     60
     61EXTRA_PROGRAMS += console_g.rel
     62CLEANFILES += console_g.rel
     63console_g_rel_SOURCES = $(console_rel_SOURCES)
     64console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     65console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     66
     67noinst_DATA += console$(LIB_VARIANT).rel
     68
     69EXTRA_PROGRAMS += timer.rel
     70CLEANFILES += timer.rel
     71timer_rel_SOURCES = timer/timer.c
     72timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     73timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     74
     75EXTRA_PROGRAMS += timer_g.rel
     76CLEANFILES += timer_g.rel
     77timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     78timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     79timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     80
     81noinst_DATA += timer$(LIB_VARIANT).rel
     82
     83include_HEADERS += irq/irq.h
     84
     85EXTRA_PROGRAMS += irq.rel
     86CLEANFILES += irq.rel
     87irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c ../shared/irq/irq_init.c \
     88    irq/bsp_irq_asm.S ../shared/irq/irq_asm.S irq/irq.h
     89irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     90irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     91
     92EXTRA_PROGRAMS += irq_g.rel
     93CLEANFILES += irq_g.rel
     94irq_g_rel_SOURCES = $(irq_rel_SOURCES)
     95irq_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     96irq_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     97
     98noinst_DATA += irq$(LIB_VARIANT).rel
     99
     100if HAS_NETWORKING
     101network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
     102EXTRA_PROGRAMS += network.rel
     103CLEANFILES += network.rel
     104network_rel_SOURCES = network/network.c
     105network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     106    $(network_CPPFLAGS)
     107network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     108
     109EXTRA_PROGRAMS += network_g.rel
     110CLEANFILES += network_g.rel
     111network_g_rel_SOURCES = $(network_rel_SOURCES)
     112network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
     113    $(network_CPPFLAGS)
     114network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     115
     116noinst_DATA += network$(LIB_VARIANT).rel
     117endif
     118
     119EXTRA_LIBRARIES = libbsp.a
     120CLEANFILES += libbsp.a
     121libbsp_a_SOURCES =
     122libbsp_a_LIBADD = clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
     123    startup$(LIB_VARIANT).rel irq$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     124if HAS_NETWORKING
     125libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     126endif
     127EXTRA_LIBRARIES += libbsp_g.a
     128CLEANFILES += libbsp_g.a
     129libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     130libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     131
     132noinst_DATA += libbsp$(LIB_VARIANT).a
     133
     134all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    18135
    19136PREINSTALL_DIRS =
     137TMPINSTALL_FILES =
    20138
    21139$(PROJECT_INCLUDE)/ep7312.h: include/ep7312.h $(PROJECT_INCLUDE)/$(dirstamp)
     
    23141PREINSTALL_FILES += $(PROJECT_INCLUDE)/ep7312.h
    24142
    25 $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
     143$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
    26144        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
    27145PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    28146
    29 CLEANFILES = $(PREINSTALL_FILES)
     147$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     148        $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     149TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     150
     151$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     152        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     153TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
     154
     155$(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp)
     156        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h
     157PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
     158
     159CLEANFILES += $(PREINSTALL_FILES)
    30160DISTCLEANFILES = $(PREINSTALL_DIRS)
     161CLEANFILES += $(TMPINSTALL_FILES)
    31162
    32 include $(top_srcdir)/../../../../automake/subdirs.am
    33163include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/arm/edb7312/configure.ac

    rf0d5e5b r9e541e3  
    99
    1010RTEMS_CANONICAL_TARGET_CPU
    11 AM_INIT_AUTOMAKE([no-define foreign 1.8])
     11AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.8])
    1212RTEMS_BSP_CONFIGURE
    1313
    1414RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
    1515RTEMS_CANONICALIZE_TOOLS
     16RTEMS_PROG_CCAS
    1617
    1718RTEMS_CHECK_NETWORKING
     
    1920
    2021# Explicitly list all Makefiles here
    21 AC_CONFIG_FILES([Makefile
    22 clock/Makefile
    23 console/Makefile
    24 irq/Makefile
    25 start/Makefile
    26 startup/Makefile
    27 timer/Makefile
    28 network/Makefile
    29 wrapup/Makefile])
     22AC_CONFIG_FILES([Makefile])
    3023AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.