Changeset 7c6c630 in rtems


Ignore:
Timestamp:
01/03/05 04:11:58 (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
71cbb66
Parents:
4cbf22a
Message:

2005-01-02 Ralf Corsepius <ralf.corsepius@…>

  • Makefile.am: Remove build-variant support.
Location:
c/src/lib/libbsp
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libbsp/mips/genmongoosev/ChangeLog

    r4cbf22a r7c6c630  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-09-24      Ralf Corsepius <ralf_corsepius@rtems.org>
    26

  • c/src/lib/libbsp/mips/genmongoosev/Makefile.am

    r4cbf22a r7c6c630  
    1212include_HEADERS = include/bsp.h
    1313include_HEADERS += include/tm27.h
     14
    1415nodist_include_HEADERS = include/bspopts.h
     16DISTCLEANFILES = include/bspopts.h
    1517
    16 EXTRA_PROGRAMS =
    17 CLEANFILES =
    18 noinst_DATA =
     18noinst_PROGRAMS =
    1919
    2020nodist_include_HEADERS += ../../shared/include/coverhd.h
    2121
    2222EXTRA_DIST = start/start.S start/regs.S start/mg5.h
    23 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     23start.$(OBJEXT): start/start.S
    2424        $(CPPASCOMPILE) -DASM -o $@ -c $<
    2525
    26 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     26project_lib_DATA = start.$(OBJEXT)
    2727
    2828dist_project_lib_DATA += startup/linkcmds
    2929
    3030startup_CPPFLAGS = -I$(srcdir)/../../mips/shared/gdbstub
    31 EXTRA_PROGRAMS += startup.rel
    32 CLEANFILES += startup.rel
     31noinst_PROGRAMS += startup.rel
    3332startup_rel_SOURCES = ../../mips/shared/gdbstub/mips-stub.c \
    3433    ../../shared/gdbstub/rtems-stub-glue.c ../../shared/bspclean.c \
    … …  
    4140startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4241
    43 EXTRA_PROGRAMS += startup_g.rel
    44 CLEANFILES += startup_g.rel
    45 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    46 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    4742    $(startup_CPPFLAGS)
    48 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    49 
    50 noinst_DATA += startup$(LIB_VARIANT).rel
    5143
    5244# FIXME: clockdrv.c and clockdrv_shell.c are structurally flawed
    5345clock_CPPFLAGS = -I$(srcdir)/../../shared
    5446EXTRA_DIST += ../../mips/shared/clockdrv_shell.c
    55 EXTRA_PROGRAMS += clock.rel
    56 CLEANFILES += clock.rel
     47noinst_PROGRAMS += clock.rel
    5748clock_rel_SOURCES = clock/clockdrv.c
    5849clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(clock_CPPFLAGS)
    5950clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6051
    61 EXTRA_PROGRAMS += clock_g.rel
    62 CLEANFILES += clock_g.rel
    63 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    64 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(clock_CPPFLAGS)
    65 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    66 
    67 noinst_DATA += clock$(LIB_VARIANT).rel
    68 
    69 EXTRA_PROGRAMS += console.rel
    70 CLEANFILES += console.rel
     52noinst_PROGRAMS += console.rel
    7153console_rel_SOURCES = console/conscfg.c ../../shared/console.c
    7254console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7355console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7456
    75 EXTRA_PROGRAMS += console_g.rel
    76 CLEANFILES += console_g.rel
    77 console_g_rel_SOURCES = $(console_rel_SOURCES)
    78 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    79 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    80 
    81 noinst_DATA += console$(LIB_VARIANT).rel
    82 
    83 EXTRA_PROGRAMS += timer.rel
    84 CLEANFILES += timer.rel
     57noinst_PROGRAMS += timer.rel
    8558timer_rel_SOURCES = timer/timer.c
    8659timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8760timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8861
    89 EXTRA_PROGRAMS += timer_g.rel
    90 CLEANFILES += timer_g.rel
    91 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    92 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    93 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    94 
    95 noinst_DATA += timer$(LIB_VARIANT).rel
    96 
    97 EXTRA_LIBRARIES = libbsp.a
    98 CLEANFILES += libbsp.a
     62noinst_LIBRARIES = libbsp.a
    9963libbsp_a_SOURCES =
    100 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    101     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
    102 libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache$(LIB_VARIANT).rel \
    103     ../../../libcpu/mips/shared/interrupts$(LIB_VARIANT).rel \
    104     ../../../libcpu/mips/mongoosev/duart$(LIB_VARIANT).rel \
    105     ../../../libcpu/mips/mongoosev/vectorisrs$(LIB_VARIANT).rel
    106 
    107 EXTRA_LIBRARIES += libbsp_g.a
    108 CLEANFILES += libbsp_g.a
    109 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    110 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    111 
    112 noinst_DATA += libbsp$(LIB_VARIANT).a
     64libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
     65libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache.rel \
     66    ../../../libcpu/mips/shared/interrupts.rel \
     67    ../../../libcpu/mips/mongoosev/duart.rel \
     68    ../../../libcpu/mips/mongoosev/vectorisrs.rel
    11369
    11470all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    … …  
    148104PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    149105
    150 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    151         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    152 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     106$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     107        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     108TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    153109
    154110$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
    … …  
    156112PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    157113
    158 CLEANFILES += $(PREINSTALL_FILES)
    159 DISTCLEANFILES = $(PREINSTALL_DIRS)
     114CLEANFILES = $(PREINSTALL_FILES)
     115DISTCLEANFILES += $(PREINSTALL_DIRS)
    160116CLEANFILES += $(TMPINSTALL_FILES)
    161117

  • c/src/lib/libbsp/mips/jmr3904/ChangeLog

    r4cbf22a r7c6c630  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-09-24      Ralf Corsepius <ralf_corsepius@rtems.org>
    26

  • c/src/lib/libbsp/mips/jmr3904/Makefile.am

    r4cbf22a r7c6c630  
    1616include_HEADERS = include/bsp.h
    1717include_HEADERS += include/tm27.h
     18
    1819nodist_include_HEADERS = include/bspopts.h
     20DISTCLEANFILES = include/bspopts.h
    1921
    20 EXTRA_PROGRAMS =
    21 CLEANFILES =
    22 noinst_DATA =
     22noinst_PROGRAMS =
    2323
    2424nodist_include_HEADERS += ../../shared/include/coverhd.h
    2525
    2626EXTRA_DIST = start/start.S start/regs.S
    27 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     27start.$(OBJEXT): start/start.S
    2828        $(CPPASCOMPILE) -DASM -o $@ -c $<
    29 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     29project_lib_DATA = start.$(OBJEXT)
    3030
    3131dist_project_lib_DATA += startup/linkcmds
    3232
    33 EXTRA_PROGRAMS += clock.rel
    34 CLEANFILES += clock.rel
     33noinst_PROGRAMS += clock.rel
    3534clock_rel_SOURCES = clock/clockdrv.c
    3635clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    3736clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3837
    39 EXTRA_PROGRAMS += clock_g.rel
    40 CLEANFILES += clock_g.rel
    41 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    42 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    43 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    44 
    45 noinst_DATA += clock$(LIB_VARIANT).rel
    46 
    47 EXTRA_PROGRAMS += console.rel
    48 CLEANFILES += console.rel
     38noinst_PROGRAMS += console.rel
    4939console_rel_SOURCES = console/console-io.c ../../shared/console-polled.c
    5040console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5141console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5242
    53 EXTRA_PROGRAMS += console_g.rel
    54 CLEANFILES += console_g.rel
    55 console_g_rel_SOURCES = $(console_rel_SOURCES)
    56 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    57 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    58 
    59 noinst_DATA += console$(LIB_VARIANT).rel
    60 
    61 EXTRA_PROGRAMS += startup.rel
    62 CLEANFILES += startup.rel
     43noinst_PROGRAMS += startup.rel
    6344startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    6445    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
    … …  
    6849startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6950
    70 EXTRA_PROGRAMS += startup_g.rel
    71 CLEANFILES += startup_g.rel
    72 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    73 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    74 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    75 
    76 noinst_DATA += startup$(LIB_VARIANT).rel
    77 
    78 EXTRA_PROGRAMS += timer.rel
    79 CLEANFILES += timer.rel
     51noinst_PROGRAMS += timer.rel
    8052timer_rel_SOURCES = timer/timer.c
    8153timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8254timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8355
    84 EXTRA_PROGRAMS += timer_g.rel
    85 CLEANFILES += timer_g.rel
    86 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    87 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    88 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    89 
    90 noinst_DATA += timer$(LIB_VARIANT).rel
    91 
    92 EXTRA_LIBRARIES = libbsp.a
    93 CLEANFILES += libbsp.a
     56noinst_LIBRARIES = libbsp.a
    9457libbsp_a_SOURCES =
    95 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    96     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
    97 libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache$(LIB_VARIANT).rel \
    98     ../../../libcpu/mips/shared/interrupts$(LIB_VARIANT).rel \
    99     ../../../libcpu/mips/tx39/vectorisrs$(LIB_VARIANT).rel
    100 
    101 EXTRA_LIBRARIES += libbsp_g.a
    102 CLEANFILES += libbsp_g.a
    103 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    104 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    105 
    106 noinst_DATA += libbsp$(LIB_VARIANT).a
     58libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
     59libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache.rel \
     60    ../../../libcpu/mips/shared/interrupts.rel \
     61    ../../../libcpu/mips/tx39/vectorisrs.rel
    10762
    10863all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    … …  
    14297PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    14398
    144 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    145         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    146 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     99$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     100        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     101TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    147102
    148103$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
    … …  
    150105PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    151106
    152 CLEANFILES += $(PREINSTALL_FILES)
    153 DISTCLEANFILES = $(PREINSTALL_DIRS)
     107CLEANFILES = $(PREINSTALL_FILES)
     108DISTCLEANFILES += $(PREINSTALL_DIRS)
    154109CLEANFILES += $(TMPINSTALL_FILES)
    155110

  • c/src/lib/libbsp/mips/p4000/ChangeLog

    r4cbf22a r7c6c630  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-09-24      Ralf Corsepius <ralf_corsepius@rtems.org>
    26

  • c/src/lib/libbsp/mips/p4000/Makefile.am

    r4cbf22a r7c6c630  
    1212include_HEADERS = include/bsp.h
    1313include_HEADERS += include/tm27.h
     14
    1415nodist_include_HEADERS = include/bspopts.h
     16DISTCLEANFILES = include/bspopts.h
    1517
    16 EXTRA_PROGRAMS =
    17 CLEANFILES =
    18 noinst_DATA =
     18noinst_PROGRAMS =
    1919
    2020include_HEADERS += include/coverhd.h
    2121
    2222EXTRA_DIST = start/start.S
    23 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     23start.$(OBJEXT): start/start.S
    2424        $(CPPASCOMPILE) -DASM -o $@ -c $<
    25 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     25project_lib_DATA = start.$(OBJEXT)
    2626
    2727dist_project_lib_DATA += startup/linkcmds
    2828
    29 EXTRA_PROGRAMS += startup.rel
    30 CLEANFILES += startup.rel
     29noinst_PROGRAMS += startup.rel
    3130startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3231    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
    … …  
    3736startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3837
    39 EXTRA_PROGRAMS += startup_g.rel
    40 CLEANFILES += startup_g.rel
    41 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    42 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    43 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    44 
    45 noinst_DATA += startup$(LIB_VARIANT).rel
    46 
    47 EXTRA_PROGRAMS += console.rel
    48 CLEANFILES += console.rel
     38noinst_PROGRAMS += console.rel
    4939console_rel_SOURCES = console/console.c console/led.S
    5040console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5141console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5242
    53 EXTRA_PROGRAMS += console_g.rel
    54 CLEANFILES += console_g.rel
    55 console_g_rel_SOURCES = $(console_rel_SOURCES)
    56 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    57 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    58 
    59 noinst_DATA += console$(LIB_VARIANT).rel
    60 
    61 EXTRA_PROGRAMS += liblnk.rel
    62 CLEANFILES += liblnk.rel
     43noinst_PROGRAMS += liblnk.rel
    6344liblnk_rel_SOURCES = liblnk/lnklib.S
    6445liblnk_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6546liblnk_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6647
    67 EXTRA_PROGRAMS += liblnk_g.rel
    68 CLEANFILES += liblnk_g.rel
    69 liblnk_g_rel_SOURCES = $(liblnk_rel_SOURCES)
    70 liblnk_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    71 liblnk_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    72 
    73 noinst_DATA += liblnk$(LIB_VARIANT).rel
    74 
    75 EXTRA_LIBRARIES = libbsp.a
    76 CLEANFILES += libbsp.a
     48noinst_LIBRARIES = libbsp.a
    7749libbsp_a_SOURCES =
    78 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
    79     liblnk$(LIB_VARIANT).rel
    80 libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache$(LIB_VARIANT).rel \
    81     ../../../libcpu/mips/shared/interrupts$(LIB_VARIANT).rel \
    82     ../../../libcpu/mips/r46xx/clock$(LIB_VARIANT).rel \
    83     ../../../libcpu/mips/r46xx/timer$(LIB_VARIANT).rel \
    84     ../../../libcpu/mips/r46xx/vectorisrs$(LIB_VARIANT).rel
    85 
    86 EXTRA_LIBRARIES += libbsp_g.a
    87 CLEANFILES += libbsp_g.a
    88 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    89 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    90 
    91 noinst_DATA += libbsp$(LIB_VARIANT).a
     50libbsp_a_LIBADD = startup.rel console.rel liblnk.rel
     51libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache.rel \
     52    ../../../libcpu/mips/shared/interrupts.rel \
     53    ../../../libcpu/mips/r46xx/clock.rel \
     54    ../../../libcpu/mips/r46xx/timer.rel \
     55    ../../../libcpu/mips/r46xx/vectorisrs.rel
    9256
    9357all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    … …  
    12993PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    13094
    131 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    132         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    133 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     95$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     96        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     97TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    13498
    13599$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
    … …  
    137101PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    138102
    139 CLEANFILES += $(PREINSTALL_FILES)
    140 DISTCLEANFILES = $(PREINSTALL_DIRS)
     103CLEANFILES = $(PREINSTALL_FILES)
     104DISTCLEANFILES += $(PREINSTALL_DIRS)
    141105CLEANFILES += $(TMPINSTALL_FILES)
    142106

  • c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog

    r4cbf22a r7c6c630  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-09-24      Ralf Corsepius <ralf_corsepius@rtems.org>
    26

  • c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am

    r4cbf22a r7c6c630  
    1212include_HEADERS = include/bsp.h
    1313include_HEADERS += include/tm27.h
     14
    1415nodist_include_HEADERS = include/bspopts.h
     16DISTCLEANFILES = include/bspopts.h
    1517
    16 EXTRA_PROGRAMS =
    17 CLEANFILES =
    18 noinst_DATA =
     18noinst_PROGRAMS =
    1919
    2020include_HEADERS += include/coverhd.h
    … …  
    2222dist_project_lib_DATA += startup/linkcmds
    2323
    24 EXTRA_PROGRAMS += clock.rel
    25 CLEANFILES += clock.rel
     24noinst_PROGRAMS += clock.rel
    2625clock_rel_SOURCES = clock/ckinit.c
    2726clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    2827clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2928
    30 EXTRA_PROGRAMS += clock_g.rel
    31 CLEANFILES += clock_g.rel
    32 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    33 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    34 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    35 
    36 noinst_DATA += clock$(LIB_VARIANT).rel
    37 
    38 EXTRA_PROGRAMS += console.rel
    39 CLEANFILES += console.rel
     29noinst_PROGRAMS += console.rel
    4030console_rel_SOURCES = console/console.c
    4131console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    4232console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4333
    44 EXTRA_PROGRAMS += console_g.rel
    45 CLEANFILES += console_g.rel
    46 console_g_rel_SOURCES = $(console_rel_SOURCES)
    47 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    48 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    49 
    50 noinst_DATA += console$(LIB_VARIANT).rel
    51 
    5234if HAS_MP
    53 EXTRA_PROGRAMS += shmsupp.rel
    54 CLEANFILES += shmsupp.rel
     35noinst_PROGRAMS += shmsupp.rel
    5536shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
    5637    shmsupp/mpisr.c
    5738shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5839shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    59 
    60 EXTRA_PROGRAMS += shmsupp_g.rel
    61 CLEANFILES += shmsupp_g.rel
    62 shmsupp_g_rel_SOURCES = $(shmsupp_rel_SOURCES)
    63 shmsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    64 shmsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    65 
    66 noinst_DATA += shmsupp$(LIB_VARIANT).rel
    6740endif
    6841
    69 EXTRA_PROGRAMS += startup.rel
    70 CLEANFILES += startup.rel
     42noinst_PROGRAMS += startup.rel
    7143startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    7244    ../../shared/bsppost.c startup/bspstart.c startup/main.c \
    … …  
    7648startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7749
    78 EXTRA_PROGRAMS += startup_g.rel
    79 CLEANFILES += startup_g.rel
    80 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    81 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    82 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    83 
    84 noinst_DATA += startup$(LIB_VARIANT).rel
    85 
    86 EXTRA_PROGRAMS += timer.rel
    87 CLEANFILES += timer.rel
     50noinst_PROGRAMS += timer.rel
    8851timer_rel_SOURCES = timer/timer.c timer/timerisr.c
    8952timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9053timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9154
    92 EXTRA_PROGRAMS += timer_g.rel
    93 CLEANFILES += timer_g.rel
    94 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    95 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    96 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    97 
    98 noinst_DATA += timer$(LIB_VARIANT).rel
    99 
    100 EXTRA_LIBRARIES = libbsp.a
    101 CLEANFILES += libbsp.a
     55noinst_LIBRARIES = libbsp.a
    10256libbsp_a_SOURCES =
    103 libbsp_a_LIBADD = startup$(LIB_VARIANT) clock$(LIB_VARIANT) \
    104     console$(LIB_VARIANT) timer$(LIB_VARIANT)
     57libbsp_a_LIBADD = startup clock console timer
    10558if HAS_MP
    106 libbsp_a_LIBADD += shmsupp$(LIB_VARIANT)
     59libbsp_a_LIBADD += shmsupp
    10760endif
    108 
    109 EXTRA_LIBRARIES += libbsp_g.a
    110 CLEANFILES += libbsp_g.a
    111 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    112 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    113 
    114 noinst_DATA += libbsp$(LIB_VARIANT).a
    11561
    11662all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    … …  
    155101PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    156102
    157 CLEANFILES += $(PREINSTALL_FILES)
    158 DISTCLEANFILES = $(PREINSTALL_DIRS)
     103CLEANFILES = $(PREINSTALL_FILES)
     104DISTCLEANFILES += $(PREINSTALL_DIRS)
    159105
    160106include $(top_srcdir)/../../../../automake/local.am

  • c/src/lib/libbsp/or32/orp/ChangeLog

    r4cbf22a r7c6c630  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-09-24      Ralf Corsepius <ralf_corsepius@rtems.org>
    26

  • c/src/lib/libbsp/or32/orp/Makefile.am

    r4cbf22a r7c6c630  
    1212include_HEADERS = include/bsp.h
    1313include_HEADERS += include/tm27.h
     14
    1415nodist_include_HEADERS = include/bspopts.h
     16DISTCLEANFILES = include/bspopts.h
    1517
    16 EXTRA_PROGRAMS =
    17 CLEANFILES =
    18 noinst_DATA =
     18noinst_PROGRAMS =
    1919
    2020include_HEADERS += include/coverhd.h
    2121
    2222EXTRA_DIST = start.S
    23 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     23start.$(OBJEXT): start/start.S
    2424        $(CPPASCOMPILE) -DASM -o $@ -c $<
    25 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     25project_lib_DATA = start.$(OBJEXT)
    2626
    2727dist_project_lib_DATA += startup/linkcmds
    2828
    29 EXTRA_PROGRAMS += startup.rel
    30 CLEANFILES += startup.rel
     29noinst_PROGRAMS += startup.rel
    3130startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
    3231    startup/bspstart.c startup/bspclean.c ../../shared/bootcard.c \
    … …  
    3635startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3736
    38 EXTRA_PROGRAMS += startup_g.rel
    39 CLEANFILES += startup_g.rel
    40 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    41 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    42 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    43 
    44 noinst_DATA += startup$(LIB_VARIANT).rel
    45 
    46 EXTRA_PROGRAMS += clock.rel
    47 CLEANFILES += clock.rel
     37noinst_PROGRAMS += clock.rel
    4838clock_rel_SOURCES = clock/clockdrv.c
    4939clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5040clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5141
    52 EXTRA_PROGRAMS += clock_g.rel
    53 CLEANFILES += clock_g.rel
    54 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    55 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    56 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    57 
    58 noinst_DATA += clock$(LIB_VARIANT).rel
    59 
    60 EXTRA_PROGRAMS += console.rel
    61 CLEANFILES += console.rel
     42noinst_PROGRAMS += console.rel
    6243console_rel_SOURCES = console/console.c console/console.h
    6344console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6445console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6546
    66 EXTRA_PROGRAMS += console_g.rel
    67 CLEANFILES += console_g.rel
    68 console_g_rel_SOURCES = $(console_rel_SOURCES)
    69 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    70 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    71 
    72 noinst_DATA += console$(LIB_VARIANT).rel
    73 
    74 EXTRA_PROGRAMS += timer.rel
    75 CLEANFILES += timer.rel
     47noinst_PROGRAMS += timer.rel
    7648timer_rel_SOURCES = timer/timer.c timer/timerisr.c
    7749timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7850timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7951
    80 EXTRA_PROGRAMS += timer_g.rel
    81 CLEANFILES += timer_g.rel
    82 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    83 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    84 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    85 
    86 noinst_DATA += timer$(LIB_VARIANT).rel
    87 
    88 EXTRA_LIBRARIES = libbsp.a
    89 CLEANFILES += libbsp.a
     52noinst_LIBRARIES = libbsp.a
    9053libbsp_a_SOURCES =
    91 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    92     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
    93 
    94 EXTRA_LIBRARIES += libbsp_g.a
    95 CLEANFILES += libbsp_g.a
    96 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    97 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    98 
    99 noinst_DATA += libbsp$(LIB_VARIANT).a
     54libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
    10055
    10156all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    … …  
    13590PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    13691
    137 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    138         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    139 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     92$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     93        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     94TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    14095
    14196$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
    … …  
    14398PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    14499
    145 CLEANFILES += $(PREINSTALL_FILES)
    146 DISTCLEANFILES = $(PREINSTALL_DIRS)
     100CLEANFILES = $(PREINSTALL_FILES)
     101DISTCLEANFILES += $(PREINSTALL_DIRS)
    147102CLEANFILES += $(TMPINSTALL_FILES)
    148103
Note: See TracChangeset for help on using the changeset viewer.