Changeset 59d46401 in rtems


Ignore:
Timestamp:
Jan 31, 2004, 2:09:37 AM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
d58c0ff
Parents:
66ae7d0
Message:

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

  • Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, network/Makefile.am, nvram/Makefile.am, pci/Makefile.am, startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, universe/Makefile.am, vectors/Makefile.am. Use automake compilation rules.
  • clock/Makefile.am, console/Makefile.am, network/Makefile.am, nvram/Makefile.am, pci/Makefile.am, startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, universe/Makefile.am, vectors/Makefile.am: Remove.
  • configure.ac: Reflect changes above.
  • wrapup/Makefile.am: Reflect changes above.
Location:
c/src/lib/libbsp/powerpc/ppcn_60x
Files:
20 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog

    r66ae7d0 r59d46401  
     12004-01-31      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
     4        network/Makefile.am, nvram/Makefile.am, pci/Makefile.am,
     5        startup/Makefile.am, timer/Makefile.am, tod/Makefile.am,
     6        universe/Makefile.am, vectors/Makefile.am. Use automake compilation
     7        rules.
     8        * clock/Makefile.am, console/Makefile.am, network/Makefile.am,
     9        nvram/Makefile.am, pci/Makefile.am, startup/Makefile.am,
     10        timer/Makefile.am, tod/Makefile.am, universe/Makefile.am,
     11        vectors/Makefile.am: Remove.
     12        * configure.ac: Reflect changes above.
     13        * wrapup/Makefile.am: Reflect changes above.
     14
    1152004-01-30      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    216
  • c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am

    r66ae7d0 r59d46401  
    77# wrapup is the one that actually builds and installs the library
    88# from the individual .rel files built in other directories
    9 SUBDIRS = . clock console startup timer tod network universe pci nvram \
    10     vectors @exceptions@ wrapup
    11 
     9SUBDIRS = . @exceptions@ wrapup
     10
     11include $(top_srcdir)/../../../../automake/compile.am
    1212include $(top_srcdir)/../../bsp.am
     13
     14EXTRA_PROGRAMS =
     15CLEANFILES =
     16noinst_DATA =
    1317
    1418nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
     
    2125project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
    2226
    23 all-local: $(PREINSTALL_FILES)
    24 
    25 EXTRA_DIST = STATUS
     27dist_project_lib_DATA += startup/linkcmds
     28
     29EXTRA_PROGRAMS += clock.rel
     30CLEANFILES += clock.rel
     31clock_rel_SOURCES = clock/clock.c
     32clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     33clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     34
     35EXTRA_PROGRAMS += clock_g.rel
     36CLEANFILES += clock_g.rel
     37clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     38clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     39clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     40
     41noinst_DATA += clock$(LIB_VARIANT).rel
     42
     43EXTRA_PROGRAMS += console.rel
     44CLEANFILES += console.rel
     45console_rel_SOURCES = console/console.c console/i8042vga.c \
     46    console/i8042vga.h console/i8042.c console/i8042_p.h \
     47    console/ns16550cfg.c console/ns16550cfg.h console/z85c30cfg.c \
     48    console/z85c30cfg.h console/vga.c console/vga_p.h
     49console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     50console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     51
     52EXTRA_PROGRAMS += console_g.rel
     53CLEANFILES += console_g.rel
     54console_g_rel_SOURCES = $(console_rel_SOURCES)
     55console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     56console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     57
     58noinst_DATA += console$(LIB_VARIANT).rel
     59
     60EXTRA_PROGRAMS += pci.rel
     61CLEANFILES += pci.rel
     62pci_rel_SOURCES = pci/pci.c
     63pci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     64pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     65
     66EXTRA_PROGRAMS += pci_g.rel
     67CLEANFILES += pci_g.rel
     68pci_g_rel_SOURCES = $(pci_rel_SOURCES)
     69pci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     70pci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     71
     72noinst_DATA += pci$(LIB_VARIANT).rel
     73
     74EXTRA_PROGRAMS += nvram.rel
     75CLEANFILES += nvram.rel
     76nvram_rel_SOURCES = nvram/nvram.c nvram/ds1385.h nvram/mk48t18.h \
     77    nvram/prepnvr.h nvram/stk11c68.h
     78nvram_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     79nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     80
     81EXTRA_PROGRAMS += nvram_g.rel
     82CLEANFILES += nvram_g.rel
     83nvram_g_rel_SOURCES = $(nvram_rel_SOURCES)
     84nvram_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     85nvram_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     86
     87noinst_DATA += nvram$(LIB_VARIANT).rel
     88
     89EXTRA_PROGRAMS += startup.rel
     90CLEANFILES += startup.rel
     91startup_rel_SOURCES = startup/bspstart.c startup/bspclean.c \
     92    ../../shared/sbrk.c startup/setvec.c startup/spurious.c \
     93    startup/genpvec.c startup/swap.c ../../shared/main.c \
     94    ../../shared/bootcard.c ../../shared/bsplibc.c ../../shared/bsppost.c \
     95    ../../shared/gnatinstallhandler.c startup/bsptrap.S
     96startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     97startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     98
     99EXTRA_PROGRAMS += startup_g.rel
     100CLEANFILES += startup_g.rel
     101startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     102startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     103startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     104
     105noinst_DATA += startup$(LIB_VARIANT).rel
     106
     107EXTRA_PROGRAMS += timer.rel
     108CLEANFILES += timer.rel
     109timer_rel_SOURCES = timer/timer.c
     110timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     111timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     112
     113EXTRA_PROGRAMS += timer_g.rel
     114CLEANFILES += timer_g.rel
     115timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     116timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     117timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     118
     119noinst_DATA += timer$(LIB_VARIANT).rel
     120
     121EXTRA_PROGRAMS += tod.rel
     122CLEANFILES += tod.rel
     123tod_rel_SOURCES = tod/tod.c tod/cmos.h
     124tod_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     125tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     126
     127EXTRA_PROGRAMS += tod_g.rel
     128CLEANFILES += tod_g.rel
     129tod_g_rel_SOURCES = $(tod_rel_SOURCES)
     130tod_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     131tod_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     132
     133noinst_DATA += tod$(LIB_VARIANT).rel
     134
     135EXTRA_PROGRAMS += universe.rel
     136CLEANFILES += universe.rel
     137universe_rel_SOURCES = universe/universe.c
     138universe_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     139universe_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     140
     141EXTRA_PROGRAMS += universe_g.rel
     142CLEANFILES += universe_g.rel
     143universe_g_rel_SOURCES = $(universe_rel_SOURCES)
     144universe_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     145universe_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     146
     147noinst_DATA += universe$(LIB_VARIANT).rel
     148
     149EXTRA_DIST += vectors/README vectors/align_h.S
     150
     151EXTRA_PROGRAMS += vectors.rel
     152CLEANFILES += vectors.rel
     153vectors_rel_SOURCES = vectors/vectors.S
     154vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     155vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     156
     157EXTRA_PROGRAMS += vectors_g.rel
     158CLEANFILES += vectors_g.rel
     159vectors_g_rel_SOURCES = $(vectors_rel_SOURCES)
     160vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     161vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     162
     163noinst_DATA += vectors$(LIB_VARIANT).rel
     164
     165if HAS_NETWORKING
     166network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
     167EXTRA_PROGRAMS += network.rel
     168CLEANFILES += network.rel
     169network_rel_SOURCES = network/amd79c970.c network/amd79c970.h
     170network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     171    $(network_CPPFLAGS)
     172network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     173
     174EXTRA_PROGRAMS += network_g.rel
     175CLEANFILES += network_g.rel
     176network_g_rel_SOURCES = $(network_rel_SOURCES)
     177network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
     178    $(network_CPPFLAGS)
     179network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     180
     181noinst_DATA += network$(LIB_VARIANT).rel
     182endif
     183
     184all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     185
     186EXTRA_DIST += STATUS
    26187
    27188PREINSTALL_DIRS =
     
    48209TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    49210
    50 CLEANFILES = $(PREINSTALL_FILES)
     211$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     212        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
     213TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
     214
     215CLEANFILES += $(PREINSTALL_FILES)
    51216DISTCLEANFILES = $(PREINSTALL_DIRS)
    52217CLEANFILES += $(TMPINSTALL_FILES)
  • c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac

    r66ae7d0 r59d46401  
    6363# Explicitly list all Makefiles here
    6464AC_CONFIG_FILES([Makefile
    65 clock/Makefile
    66 console/Makefile
    67 network/Makefile
    68 nvram/Makefile
    69 pci/Makefile
    70 startup/Makefile
    71 timer/Makefile
    72 tod/Makefile
    73 universe/Makefile
    74 vectors/Makefile
    7565wrapup/Makefile])
    7666
  • c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am

    r66ae7d0 r59d46401  
    33##
    44
    5 # We only build the network device driver if HAS_NETWORK was defined
     5OBJS = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \
     6    ../console$(LIB_VARIANT).rel ../timer$(LIB_VARIANT).rel \
     7    ../tod$(LIB_VARIANT).rel ../nvram$(LIB_VARIANT).rel \
     8    ../universe$(LIB_VARIANT).rel ../pci$(LIB_VARIANT).rel \
     9    ../vectors$(LIB_VARIANT).rel
    610if HAS_NETWORKING
    7 NETWORK = network
     11OBJS += ../network$(LIB_VARIANT).rel
    812endif
    913
    10 BSP_PIECES = startup clock console timer tod $(NETWORK) nvram universe pci \
    11     vectors
    12 
    13 # bummer; have to use $foreach since % pattern subst rules only replace 1x
    14 OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
    15     ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel
     14OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel
    1615
    1716include $(top_srcdir)/../../../../automake/compile.am
Note: See TracChangeset for help on using the changeset viewer.