Changeset 4cbf22a in rtems


Ignore:
Timestamp:
Jan 2, 2005, 9:06:25 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
7c6c630
Parents:
7722eff7
Message:

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

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

Legend:

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

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-05      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am

    r7722eff7 r4cbf22a  
    55ACLOCAL_AMFLAGS = -I ../../../../aclocal
    66
    7 EXTRA_PROGRAMS =
    8 CLEANFILES =
    9 noinst_DATA =
     7noinst_PROGRAMS =
    108
    119include $(top_srcdir)/../../../../automake/compile.am
     
    1614include_HEADERS = include/bsp.h
    1715include_HEADERS += include/tm27.h
     16
    1817nodist_include_HEADERS = include/bspopts.h
     18DISTCLEANFILES = include/bspopts.h
    1919
    2020include_HEADERS += include/registers.h
     
    2323
    2424EXTRA_DIST = start/start.S
    25 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     25start.$(OBJEXT): start/start.S
    2626        $(CPPASCOMPILE) -DASM -o $@ -c $<
    27 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     27project_lib_DATA = start.$(OBJEXT)
    2828
    2929dist_project_lib_DATA += startup/linkcmds
    3030
    31 EXTRA_PROGRAMS += startup.rel
    32 CLEANFILES += startup.rel
     31noinst_PROGRAMS += startup.rel
    3332startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
    3433    startup/bspstart.c startup/exit.c ../../shared/bootcard.c \
     
    3837startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3938
    40 EXTRA_PROGRAMS += startup_g.rel
    41 CLEANFILES += startup_g.rel
    42 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    43 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    44 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    45 
    46 noinst_DATA += startup$(LIB_VARIANT).rel
    47 
    48 EXTRA_PROGRAMS += clock.rel
    49 CLEANFILES += clock.rel
     39noinst_PROGRAMS += clock.rel
    5040clock_rel_SOURCES = clock/clockdrv.c
    5141clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5242clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5343
    54 EXTRA_PROGRAMS += clock_g.rel
    55 CLEANFILES += clock_g.rel
    56 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    57 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    58 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    59 
    60 noinst_DATA += clock$(LIB_VARIANT).rel
    61 
    62 EXTRA_PROGRAMS += console.rel
    63 CLEANFILES += console.rel
     44noinst_PROGRAMS += console.rel
    6445console_rel_SOURCES = ../../arm/shared/comm/uart.c \
    6546    ../../arm/shared/comm/console.c
     
    6748console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6849
    69 EXTRA_PROGRAMS += console_g.rel
    70 CLEANFILES += console_g.rel
    71 console_g_rel_SOURCES = $(console_rel_SOURCES)
    72 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    73 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    74 
    75 noinst_DATA += console$(LIB_VARIANT).rel
    76 
    77 EXTRA_PROGRAMS += timer.rel
    78 CLEANFILES += timer.rel
     50noinst_PROGRAMS += timer.rel
    7951timer_rel_SOURCES = ../../shared/timerstub.c
    8052timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8153timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8254
    83 EXTRA_PROGRAMS += timer_g.rel
    84 CLEANFILES += timer_g.rel
    85 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    86 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    87 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    88 
    89 noinst_DATA += timer$(LIB_VARIANT).rel
    90 
    9155include_HEADERS += irq/irq.h
    9256
    93 EXTRA_PROGRAMS += irq.rel
    94 CLEANFILES += irq.rel
     57noinst_PROGRAMS += irq.rel
    9558irq_rel_SOURCES = irq/irq.c ../../arm/shared/irq/irq_init.c \
    9659    irq/bsp_irq_init.c ../../arm/shared/irq/irq_asm.S irq/bsp_irq_asm.S \
     
    9962irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    10063
    101 EXTRA_PROGRAMS += irq_g.rel
    102 CLEANFILES += irq_g.rel
    103 irq_g_rel_SOURCES = $(irq_rel_SOURCES)
    104 irq_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    105 irq_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    106 
    107 noinst_DATA += irq$(LIB_VARIANT).rel
    108 
    109 EXTRA_LIBRARIES = libbsp.a
    110 CLEANFILES += libbsp.a
     64noinst_LIBRARIES = libbsp.a
    11165libbsp_a_SOURCES =
    112 
    113 libbsp_a_LIBADD= clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
    114     startup$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel irq$(LIB_VARIANT).rel
    115 
    116 EXTRA_LIBRARIES += libbsp_g.a
    117 CLEANFILES += libbsp_g.a
    118 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    119 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    120 
    121 noinst_DATA += libbsp$(LIB_VARIANT).a
     66libbsp_a_LIBADD= clock.rel console.rel startup.rel timer.rel irq.rel
    12267
    12368all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    161106PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    162107
    163 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    164         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    165 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     108$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     109        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     110TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    166111
    167112$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    173118PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
    174119
    175 CLEANFILES += $(PREINSTALL_FILES)
    176 DISTCLEANFILES = $(PREINSTALL_DIRS)
     120CLEANFILES = $(PREINSTALL_FILES)
     121DISTCLEANFILES += $(PREINSTALL_DIRS)
    177122CLEANFILES += $(TMPINSTALL_FILES)
    178123
  • c/src/lib/libbsp/arm/armulator/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-05      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/arm/armulator/Makefile.am

    r7722eff7 r4cbf22a  
    55ACLOCAL_AMFLAGS = -I ../../../../aclocal
    66
    7 EXTRA_PROGRAMS =
    8 CLEANFILES =
    9 noinst_DATA =
     7noinst_PROGRAMS =
    108
    119include $(top_srcdir)/../../../../automake/compile.am
     
    1614include_HEADERS = include/bsp.h
    1715include_HEADERS += include/tm27.h
     16
    1817nodist_include_HEADERS = include/bspopts.h
     18DISTCLEANFILES = include/bspopts.h
    1919
    2020nodist_include_HEADERS += ../../shared/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/trap.S ../../shared/bsplibc.c \
    3231    ../../shared/bsppost.c startup/bspstart.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-io.c ../../shared/console-polled.c
    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 = ../../shared/timerstub.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
  • c/src/lib/libbsp/arm/csb336/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-05      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/arm/csb336/Makefile.am

    r7722eff7 r4cbf22a  
    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
    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/exit.c startup/memmap.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 += console.rel
    47 CLEANFILES += console.rel
     37noinst_PROGRAMS += console.rel
    4838console_rel_SOURCES = console/uart.c ../../shared/console.c
    4939console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5040console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5141
    52 EXTRA_PROGRAMS += console_g.rel
    53 CLEANFILES += console_g.rel
    54 console_g_rel_SOURCES = $(console_rel_SOURCES)
    55 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    56 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    57 
    58 noinst_DATA += console$(LIB_VARIANT).rel
    59 
    6042if HAS_NETWORKING
    6143network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    62 EXTRA_PROGRAMS += network.rel
    63 CLEANFILES += network.rel
     44noinst_PROGRAMS += network.rel
    6445network_rel_SOURCES = network/network.c network/lan91c11x.c
    6546network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    6647    $(network_CPPFLAGS)
    6748network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    68 
    69 EXTRA_PROGRAMS += network_g.rel
    70 CLEANFILES += network_g.rel
    71 network_g_rel_SOURCES = $(network_rel_SOURCES)
    72 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    73     $(network_CPPFLAGS)
    74 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    75 
    76 noinst_DATA += network$(LIB_VARIANT).rel
    7749endif
    7850
    79 EXTRA_LIBRARIES = libbsp.a
    80 CLEANFILES += libbsp.a
     51noinst_LIBRARIES = libbsp.a
    8152libbsp_a_SOURCES =
    82 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel
     53libbsp_a_LIBADD = startup.rel console.rel
    8354if HAS_NETWORKING
    84 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     55libbsp_a_LIBADD += network.rel
    8556endif
    86 libbsp_a_LIBADD += \
    87     ../../../libcpu/@RTEMS_CPU@/shared/arm920$(LIB_VARIANT).rel \
    88     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \
    89     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer$(LIB_VARIANT).rel \
    90     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq$(LIB_VARIANT).rel
    91 
    92 EXTRA_LIBRARIES += libbsp_g.a
    93 CLEANFILES += libbsp_g.a
    94 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    95 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    96 
    97 noinst_DATA += libbsp$(LIB_VARIANT).a
     57libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
     58    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
     59    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
     60    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
    9861
    9962all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    13396PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    13497
    135 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    136         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    137 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     98$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     99        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     100TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    138101
    139102$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    141104PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    142105
    143 CLEANFILES += $(PREINSTALL_FILES)
    144 DISTCLEANFILES = $(PREINSTALL_DIRS)
     106CLEANFILES = $(PREINSTALL_FILES)
     107DISTCLEANFILES += $(PREINSTALL_DIRS)
    145108CLEANFILES += $(TMPINSTALL_FILES)
    146109
  • c/src/lib/libbsp/arm/csb337/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-05      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/arm/csb337/Makefile.am

    r7722eff7 r4cbf22a  
    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
    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/exit.c startup/memmap.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 += console.rel
    47 CLEANFILES += console.rel
     37noinst_PROGRAMS += console.rel
    4838console_rel_SOURCES = console/uarts.c ../../shared/console.c
    4939console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5040console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5141
    52 EXTRA_PROGRAMS += console_g.rel
    53 CLEANFILES += console_g.rel
    54 console_g_rel_SOURCES = $(console_rel_SOURCES)
    55 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    56 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    57 
    58 noinst_DATA += console$(LIB_VARIANT).rel
    59 
    6042if HAS_NETWORKING
    6143network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    62 EXTRA_PROGRAMS += network.rel
    63 CLEANFILES += network.rel
     44noinst_PROGRAMS += network.rel
    6445network_rel_SOURCES = network/network.c
    6546network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    6647    $(network_CPPFLAGS)
    6748network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    68 
    69 EXTRA_PROGRAMS += network_g.rel
    70 CLEANFILES += network_g.rel
    71 network_g_rel_SOURCES = $(network_rel_SOURCES)
    72 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    73     $(network_CPPFLAGS)
    74 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    75 
    76 noinst_DATA += network$(LIB_VARIANT).rel
    7749endif
    7850
    79 EXTRA_LIBRARIES = libbsp.a
    80 CLEANFILES += libbsp.a
     51noinst_LIBRARIES = libbsp.a
    8152libbsp_a_SOURCES =
    82 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel
     53libbsp_a_LIBADD = startup.rel console.rel
    8354if HAS_NETWORKING
    84 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     55libbsp_a_LIBADD += network.rel
    8556endif
    86 libbsp_a_LIBADD += \
    87     ../../../libcpu/@RTEMS_CPU@/shared/arm920$(LIB_VARIANT).rel \
    88     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \
    89     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu$(LIB_VARIANT).rel \
    90     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer$(LIB_VARIANT).rel \
    91     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/pmc$(LIB_VARIANT).rel \
    92     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq$(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
     57libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
     58    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
     59    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu.rel \
     60    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
     61    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/pmc.rel \
     62    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
    10063
    10164all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    13598PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    13699
    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)
     100$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     101        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     102TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    140103
    141104$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    143106PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    144107
    145 CLEANFILES += $(PREINSTALL_FILES)
    146 DISTCLEANFILES = $(PREINSTALL_DIRS)
     108CLEANFILES = $(PREINSTALL_FILES)
     109DISTCLEANFILES += $(PREINSTALL_DIRS)
    147110CLEANFILES += $(TMPINSTALL_FILES)
    148111
  • c/src/lib/libbsp/arm/edb7312/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-05      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/arm/edb7312/Makefile.am

    r7722eff7 r4cbf22a  
    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/ep7312.h
     
    2222
    2323EXTRA_DIST = start/start.S
    24 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     24start.$(OBJEXT): start/start.S
    2525        $(CPPASCOMPILE) -DASM -o $@ -c $<
    26 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     26project_lib_DATA = start.$(OBJEXT)
    2727
    2828dist_project_lib_DATA += startup/linkcmds
    2929
    30 EXTRA_PROGRAMS += startup.rel
    31 CLEANFILES += startup.rel
     30noinst_PROGRAMS += startup.rel
    3231startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
    3332    startup/bspstart.c startup/exit.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 += clock.rel
    48 CLEANFILES += clock.rel
     38noinst_PROGRAMS += clock.rel
    4939clock_rel_SOURCES = clock/clockdrv.c
    5040clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5141clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5242
    53 EXTRA_PROGRAMS += clock_g.rel
    54 CLEANFILES += clock_g.rel
    55 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    56 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    57 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    58 
    59 noinst_DATA += clock$(LIB_VARIANT).rel
    60 
    61 EXTRA_PROGRAMS += console.rel
    62 CLEANFILES += console.rel
     43noinst_PROGRAMS += console.rel
    6344console_rel_SOURCES = console/uart.c ../../shared/console.c
    6445console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6546console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6647
    67 EXTRA_PROGRAMS += console_g.rel
    68 CLEANFILES += console_g.rel
    69 console_g_rel_SOURCES = $(console_rel_SOURCES)
    70 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    71 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    72 
    73 noinst_DATA += console$(LIB_VARIANT).rel
    74 
    75 EXTRA_PROGRAMS += timer.rel
    76 CLEANFILES += timer.rel
     48noinst_PROGRAMS += timer.rel
    7749timer_rel_SOURCES = timer/timer.c
    7850timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7951timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8052
    81 EXTRA_PROGRAMS += timer_g.rel
    82 CLEANFILES += timer_g.rel
    83 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    84 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    85 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    86 
    87 noinst_DATA += timer$(LIB_VARIANT).rel
    88 
    8953include_HEADERS += irq/irq.h
    9054
    91 EXTRA_PROGRAMS += irq.rel
    92 CLEANFILES += irq.rel
     55noinst_PROGRAMS += irq.rel
    9356irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c \
    9457    ../../arm/shared/irq/irq_init.c irq/bsp_irq_asm.S \
     
    9760irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9861
    99 EXTRA_PROGRAMS += irq_g.rel
    100 CLEANFILES += irq_g.rel
    101 irq_g_rel_SOURCES = $(irq_rel_SOURCES)
    102 irq_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    103 irq_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    104 
    105 noinst_DATA += irq$(LIB_VARIANT).rel
    106 
    10762if HAS_NETWORKING
    10863network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    109 EXTRA_PROGRAMS += network.rel
    110 CLEANFILES += network.rel
     64noinst_PROGRAMS += network.rel
    11165network_rel_SOURCES = network/network.c
    11266network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    11367    $(network_CPPFLAGS)
    11468network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    115 
    116 EXTRA_PROGRAMS += network_g.rel
    117 CLEANFILES += network_g.rel
    118 network_g_rel_SOURCES = $(network_rel_SOURCES)
    119 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    120     $(network_CPPFLAGS)
    121 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    122 
    123 noinst_DATA += network$(LIB_VARIANT).rel
    12469endif
    12570
    126 EXTRA_LIBRARIES = libbsp.a
    127 CLEANFILES += libbsp.a
     71noinst_LIBRARIES = libbsp.a
    12872libbsp_a_SOURCES =
    129 libbsp_a_LIBADD = clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
    130     startup$(LIB_VARIANT).rel irq$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     73libbsp_a_LIBADD = clock.rel console.rel startup.rel irq.rel timer.rel
    13174if HAS_NETWORKING
    132 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     75libbsp_a_LIBADD += network.rel
    13376endif
    134 EXTRA_LIBRARIES += libbsp_g.a
    135 CLEANFILES += libbsp_g.a
    136 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    137 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    138 
    139 noinst_DATA += libbsp$(LIB_VARIANT).a
    14077
    14178all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    179116PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    180117
    181 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    182         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    183 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     118$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     119        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     120TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    184121
    185122$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    191128PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
    192129
    193 CLEANFILES += $(PREINSTALL_FILES)
    194 DISTCLEANFILES = $(PREINSTALL_DIRS)
     130CLEANFILES = $(PREINSTALL_FILES)
     131DISTCLEANFILES += $(PREINSTALL_DIRS)
    195132CLEANFILES += $(TMPINSTALL_FILES)
    196133
  • c/src/lib/libbsp/arm/vegaplus/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-05      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/arm/vegaplus/Makefile.am

    r7722eff7 r4cbf22a  
    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/registers.h
     
    2323
    2424EXTRA_DIST = start/start.S
    25 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     25start.$(OBJEXT): start/start.S
    2626        $(CPPASCOMPILE) -DASM -o $@ -c $<
    27 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     27project_lib_DATA = start.$(OBJEXT)
    2828
    2929dist_project_lib_DATA += startup/linkcmds
    3030
    31 EXTRA_PROGRAMS += startup.rel
    32 CLEANFILES += startup.rel
     31noinst_PROGRAMS += startup.rel
    3332startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
    3433    startup/bspstart.c startup/exit.c ../../shared/bootcard.c \
     
    3837startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3938
    40 EXTRA_PROGRAMS += startup_g.rel
    41 CLEANFILES += startup_g.rel
    42 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    43 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    44 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    45 
    46 noinst_DATA += startup$(LIB_VARIANT).rel
    47 
    4839include_HEADERS += irq/irq.h
    4940
    50 EXTRA_PROGRAMS += irq.rel
    51 CLEANFILES += irq.rel
     41noinst_PROGRAMS += irq.rel
    5242irq_rel_SOURCES = irq/irq.c ../../arm/shared/irq/irq_init.c \
    5343    irq/bsp_irq_init.c ../../arm/shared/irq/irq_asm.S irq/bsp_irq_asm.S \
     
    5646irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5747
    58 EXTRA_PROGRAMS += irq_g.rel
    59 CLEANFILES += irq_g.rel
    60 irq_g_rel_SOURCES = $(irq_rel_SOURCES)
    61 irq_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    62 irq_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    63 
    64 noinst_DATA += irq$(LIB_VARIANT).rel
    65 
    66 EXTRA_PROGRAMS += clock.rel
    67 CLEANFILES += clock.rel
     48noinst_PROGRAMS += clock.rel
    6849clock_rel_SOURCES = clock/clockdrv.c
    6950clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7051clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7152
    72 EXTRA_PROGRAMS += clock_g.rel
    73 CLEANFILES += clock_g.rel
    74 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    75 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    76 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    77 
    78 noinst_DATA += clock$(LIB_VARIANT).rel
    79 
    80 EXTRA_PROGRAMS += console.rel
    81 CLEANFILES += console.rel
     53noinst_PROGRAMS += console.rel
    8254console_rel_SOURCES = ../../arm/shared/comm/uart.c \
    8355    ../../arm/shared/comm/console.c
     
    8557console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8658
    87 EXTRA_PROGRAMS += console_g.rel
    88 CLEANFILES += console_g.rel
    89 console_g_rel_SOURCES = $(console_rel_SOURCES)
    90 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    91 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    92 
    93 noinst_DATA += console$(LIB_VARIANT).rel
    94 
    95 EXTRA_PROGRAMS += timer.rel
    96 CLEANFILES += timer.rel
     59noinst_PROGRAMS += timer.rel
    9760timer_rel_SOURCES = ../../shared/timerstub.c
    9861timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9962timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    10063
    101 EXTRA_PROGRAMS += timer_g.rel
    102 CLEANFILES += timer_g.rel
    103 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    104 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    105 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    106 
    107 noinst_DATA += timer$(LIB_VARIANT).rel
    108 
    109 EXTRA_LIBRARIES = libbsp.a
    110 CLEANFILES += libbsp.a
     64noinst_LIBRARIES = libbsp.a
    11165libbsp_a_SOURCES =
    112 libbsp_a_LIBADD = clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
    113     startup$(LIB_VARIANT).rel irq$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
    114 
    115 EXTRA_LIBRARIES += libbsp_g.a
    116 CLEANFILES += libbsp_g.a
    117 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    118 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    119 
    120 noinst_DATA += libbsp$(LIB_VARIANT).a
     66libbsp_a_LIBADD = clock.rel console.rel startup.rel irq.rel timer.rel
    12167
    12268all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    160106PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    161107
    162 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    163         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    164 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     108$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     109        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     110TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    165111
    166112$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    172118PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
    173119
    174 CLEANFILES += $(PREINSTALL_FILES)
    175 DISTCLEANFILES = $(PREINSTALL_DIRS)
     120CLEANFILES = $(PREINSTALL_FILES)
     121DISTCLEANFILES += $(PREINSTALL_DIRS)
    176122CLEANFILES += $(TMPINSTALL_FILES)
    177123
  • c/src/lib/libbsp/i386/i386ex/ChangeLog

    r7722eff7 r4cbf22a  
     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/i386/i386ex/Makefile.am

    r7722eff7 r4cbf22a  
    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
     
    2222noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc
    2323EXTRA_DIST = start/start.S
    24 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     24start.$(OBJEXT): start/start.S
    2525        $(CPPASCOMPILE) -DASM -o $@ -c $<
    2626
    27 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     27project_lib_DATA = start.$(OBJEXT)
    2828dist_project_lib_DATA += startup/linkcmds
    2929
    30 EXTRA_PROGRAMS += startup.rel
    31 CLEANFILES += startup.rel
     30noinst_PROGRAMS += startup.rel
    3231startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
    3332    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.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)
    47 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    48 
    49 noinst_DATA += startup$(LIB_VARIANT).rel
    50 
    51 EXTRA_PROGRAMS += clock.rel
    52 CLEANFILES += clock.rel
     42noinst_PROGRAMS += clock.rel
    5343clock_rel_SOURCES = clock/ckinit.c
    5444clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5545clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5646
    57 EXTRA_PROGRAMS += clock_g.rel
    58 CLEANFILES += clock_g.rel
    59 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    60 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    61 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    62 
    63 noinst_DATA += clock$(LIB_VARIANT).rel
    64 
    65 EXTRA_PROGRAMS += console.rel
    66 CLEANFILES += console.rel
     47noinst_PROGRAMS += console.rel
    6748console_rel_SOURCES = console/console.c
    6849console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6950console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7051
    71 EXTRA_PROGRAMS += console_g.rel
    72 CLEANFILES += console_g.rel
    73 console_g_rel_SOURCES = $(console_rel_SOURCES)
    74 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    75 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    76 
    77 noinst_DATA += console$(LIB_VARIANT).rel
    78 
    79 EXTRA_PROGRAMS += timer.rel
    80 CLEANFILES += timer.rel
     52noinst_PROGRAMS += timer.rel
    8153timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    8254timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8355timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8456
    85 EXTRA_PROGRAMS += timer_g.rel
    86 CLEANFILES += timer_g.rel
    87 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    88 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    89 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    90 
    91 noinst_DATA += timer$(LIB_VARIANT).rel
    92 
    9357if HAS_NETWORKING
    9458network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    95 EXTRA_PROGRAMS += network.rel
    96 CLEANFILES += network.rel
     59noinst_PROGRAMS += network.rel
    9760network_rel_SOURCES = network/netexterns.h network/network.c \
    9861    network/uti596.h
     
    10063    $(network_CPPFLAGS)
    10164network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    102 
    103 EXTRA_PROGRAMS += network_g.rel
    104 CLEANFILES += network_g.rel
    105 network_g_rel_SOURCES = $(network_rel_SOURCES)
    106 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    107 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    108 
    109 noinst_DATA += network$(LIB_VARIANT).rel
    11065endif
    11166
    112 EXTRA_LIBRARIES = libbsp.a
    113 CLEANFILES += libbsp.a
     67noinst_LIBRARIES = libbsp.a
    11468libbsp_a_SOURCES =
    115 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    116     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     69libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
    11770if HAS_NETWORKING
    118 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     71libbsp_a_LIBADD += network.rel
    11972endif
    120 libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \
    121     ../../../libcpu/i386/score$(LIB_VARIANT).rel
    122 
    123 EXTRA_LIBRARIES += libbsp_g.a
    124 CLEANFILES += libbsp_g.a
    125 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    126 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    127 
    128 noinst_DATA += libbsp$(LIB_VARIANT).a
     73libbsp_a_LIBADD += ../../../libcpu/i386/cache.rel \
     74    ../../../libcpu/i386/score.rel
    12975
    13076all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    164110PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    165111
    166 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    167         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    168 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     112$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     113        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     114TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    169115
    170116$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    172118PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    173119
    174 CLEANFILES += $(PREINSTALL_FILES)
    175 DISTCLEANFILES = $(PREINSTALL_DIRS)
     120CLEANFILES = $(PREINSTALL_FILES)
     121DISTCLEANFILES += $(PREINSTALL_DIRS)
    176122CLEANFILES += $(TMPINSTALL_FILES)
    177123
  • c/src/lib/libbsp/i386/pc386/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-20      Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
    26
  • c/src/lib/libbsp/i386/pc386/Makefile.am

    r7722eff7 r4cbf22a  
    1515include_HEADERS = include/bsp.h
    1616include_HEADERS += include/tm27.h
     17
    1718nodist_include_HEADERS = include/bspopts.h
    18 
    19 EXTRA_PROGRAMS =
    20 CLEANFILES =
    21 noinst_DATA =
     19DISTCLEANFILES = include/bspopts.h
     20
     21noinst_PROGRAMS =
    2222
    2323SUBDIRS = . tools
     
    2727
    2828EXTRA_DIST = start/start.S
    29 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     29start.$(OBJEXT): start/start.S
    3030        $(CPPASCOMPILE) -DASM -o $@ -c $<
    3131
    32 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     32project_lib_DATA = start.$(OBJEXT)
    3333
    3434EXTRA_DIST += start/start16.S
     
    3636        $(CPPASCOMPILE) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ -c $<
    3737
    38 start16$(LIB_VARIANT)-elf32.$(OBJEXT): start16.$(OBJEXT)
     38start16-elf32.$(OBJEXT): start16.$(OBJEXT)
    3939        $(LD) -N -T $(top_srcdir)/startup/linkcmds -Ttext $(START16ADDR) -e start16 -nostdlib \
    4040          --oformat=elf32-i386 \
    4141        -o $@ $<
    4242
    43 start16$(LIB_VARIANT).bin: start16$(LIB_VARIANT)-elf32.$(OBJEXT)
     43start16.bin: start16-elf32.$(OBJEXT)
    4444        $(OBJCOPY) -O binary $< $@
    45 CLEANFILES += start16.bin start16_g.bin
    46 
    47 project_lib_DATA += start16$(LIB_VARIANT).bin
     45CLEANFILES += start16.bin
     46
     47project_lib_DATA += start16.bin
    4848
    4949dist_project_lib_DATA += startup/linkcmds
    5050
    51 EXTRA_PROGRAMS += clock.rel
    52 CLEANFILES += clock.rel
     51noinst_PROGRAMS += clock.rel
    5352clock_rel_SOURCES = clock/ckinit.c clock/todcfg.c ../../shared/tod.c
    5453clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5554clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5655
    57 EXTRA_PROGRAMS += clock_g.rel
    58 CLEANFILES += clock_g.rel
    59 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    60 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    61 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    62 
    63 noinst_DATA += clock$(LIB_VARIANT).rel
    64 
    6556include_rtemsdir = $(includedir)/rtems
    6657include_rtems_HEADERS = console/keyboard.h console/kd.h \
    6758    console/serial_mouse.h console/ps2_drv.h console/fb_vga.h
    6859
    69 EXTRA_PROGRAMS += console.rel
    70 CLEANFILES += console.rel
     60noinst_PROGRAMS += console.rel
    7161console_rel_SOURCES = console/console.c console/inch.c console/outch.c \
    7262    console/defkeymap.c console/fb_vga.c console/keyboard.c \
     
    7767console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7868
    79 EXTRA_PROGRAMS += console_g.rel
    80 CLEANFILES += console_g.rel
    81 console_g_rel_SOURCES = $(console_rel_SOURCES)
    82 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    83 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    84 
    85 noinst_DATA += console$(LIB_VARIANT).rel
    86 
    87 EXTRA_PROGRAMS += gdb.rel
    88 CLEANFILES += gdb.rel
     69noinst_PROGRAMS += gdb.rel
    8970gdb_rel_SOURCES = ../../i386/shared/comm/i386-stub.c \
    9071    ../../i386/shared/comm/i386-stub-glue.c \
     
    9374gdb_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9475
    95 EXTRA_PROGRAMS += gdb_g.rel
    96 CLEANFILES += gdb_g.rel
    97 gdb_g_rel_SOURCES = $(gdb_rel_SOURCES)
    98 gdb_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    99 gdb_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    100 
    101 noinst_DATA += gdb$(LIB_VARIANT).rel
    102 
    103 EXTRA_PROGRAMS += gnat.rel
    104 CLEANFILES += gnat.rel
     76noinst_PROGRAMS += gnat.rel
    10577gnat_rel_SOURCES = ../../shared/gnatinstallhandler.c
    10678gnat_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    10779gnat_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    10880
    109 EXTRA_PROGRAMS += gnat_g.rel
    110 CLEANFILES += gnat_g.rel
    111 gnat_g_rel_SOURCES = $(gnat_rel_SOURCES)
    112 gnat_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    113 gnat_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    114 
    115 noinst_DATA += gnat$(LIB_VARIANT).rel
    116 
    117 EXTRA_PROGRAMS += pci.rel
    118 CLEANFILES += pci.rel
     81noinst_PROGRAMS += pci.rel
    11982pci_rel_SOURCES = ../../i386/shared/pci/pcibios.c
    12083pci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    12184pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    12285
    123 EXTRA_PROGRAMS += pci_g.rel
    124 CLEANFILES += pci_g.rel
    125 pci_g_rel_SOURCES = $(pci_rel_SOURCES)
    126 pci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    127 pci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    128 
    129 noinst_DATA += pci$(LIB_VARIANT).rel
    130 
    131 EXTRA_PROGRAMS += startup.rel
    132 CLEANFILES += startup.rel
     86noinst_PROGRAMS += startup.rel
    13387startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
    13488    startup/bspstart.c startup/exit.c ../../i386/shared/irq/idt.c \
     
    13993startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    14094
    141 EXTRA_PROGRAMS += startup_g.rel
    142 CLEANFILES += startup_g.rel
    143 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    144 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    145 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    146 
    147 noinst_DATA += startup$(LIB_VARIANT).rel
    148 
    149 EXTRA_PROGRAMS += timer.rel
    150 CLEANFILES += timer.rel
     95noinst_PROGRAMS += timer.rel
    15196timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    15297timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    15398timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    15499
    155 EXTRA_PROGRAMS += timer_g.rel
    156 CLEANFILES += timer_g.rel
    157 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    158 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    159 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    160 
    161 noinst_DATA += timer$(LIB_VARIANT).rel
    162 
    163100if HAS_NETWORKING
    164101ne2000_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    165 EXTRA_PROGRAMS += ne2000.rel
    166 CLEANFILES += ne2000.rel
     102noinst_PROGRAMS += ne2000.rel
    167103ne2000_rel_SOURCES = ne2000/ne2000.c
    168104ne2000_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    169105    $(ne2000_CPPFLAGS)
    170106ne2000_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    171 
    172 EXTRA_PROGRAMS += ne2000_g.rel
    173 CLEANFILES += ne2000_g.rel
    174 ne2000_g_rel_SOURCES = $(ne2000_rel_SOURCES)
    175 ne2000_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(ne2000_CPPFLAGS)
    176 ne2000_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    177 
    178 noinst_DATA += ne2000$(LIB_VARIANT).rel
    179107endif
    180108
     
    185113
    186114wd8003_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    187 EXTRA_PROGRAMS += wd8003.rel
    188 CLEANFILES += wd8003.rel
     115noinst_PROGRAMS += wd8003.rel
    189116wd8003_rel_SOURCES = wd8003/wd8003.c include/wd80x3.h
    190117wd8003_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    191118    $(wd8003_CPPFLAGS)
    192119wd8003_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    193 
    194 EXTRA_PROGRAMS += wd8003_g.rel
    195 CLEANFILES += wd8003_g.rel
    196 wd8003_g_rel_SOURCES = $(wd8003_rel_SOURCES)
    197 wd8003_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(wd8003_CPPFLAGS)
    198 wd8003_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    199 
    200 noinst_DATA += wd8003$(LIB_VARIANT).rel
    201120endif
    202121
    203122if HAS_NETWORKING
    2041233c509_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    205 EXTRA_PROGRAMS += 3c509.rel
    206 CLEANFILES += 3c509.rel
     124noinst_PROGRAMS += 3c509.rel
    2071253c509_rel_SOURCES = 3c509/3c509.c 3c509/3c509.h 3c509/elink.c 3c509/elink.h
    2081263c509_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(3c509_CPPFLAGS)
    2091273c509_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    210 
    211 EXTRA_PROGRAMS += 3c509_g.rel
    212 CLEANFILES += 3c509_g.rel
    213 3c509_g_rel_SOURCES = $(3c509_rel_SOURCES)
    214 3c509_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(3c509_CPPFLAGS)
    215 3c509_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    216 
    217 noinst_DATA += 3c509$(LIB_VARIANT).rel
    218 endif
    219 
    220 EXTRA_PROGRAMS += ide.rel
    221 CLEANFILES += ide.rel
     128endif
     129
     130noinst_PROGRAMS += ide.rel
    222131ide_rel_SOURCES = ide/idecfg.c ide/ide.c
    223132ide_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    224133ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    225134
    226 EXTRA_PROGRAMS += ide_g.rel
    227 CLEANFILES += ide_g.rel
    228 ide_g_rel_SOURCES = $(ide_rel_SOURCES)
    229 ide_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    230 ide_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    231 
    232 noinst_DATA += ide$(LIB_VARIANT).rel
    233 
    234 EXTRA_LIBRARIES = libbsp.a
    235 CLEANFILES += libbsp.a
     135noinst_LIBRARIES = libbsp.a
    236136libbsp_a_SOURCES =
    237 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    238     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel ide$(LIB_VARIANT).rel \
    239     gdb$(LIB_VARIANT).rel gnat$(LIB_VARIANT).rel pci$(LIB_VARIANT).rel
     137libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel ide.rel \
     138    gdb.rel gnat.rel pci.rel
    240139# We only build the Network library if HAS_NETWORKING was defined
    241140# dec21140 is supported via libchip
    242141if HAS_NETWORKING
    243 libbsp_a_LIBADD += ne2000$(LIB_VARIANT).rel wd8003$(LIB_VARIANT).rel \
    244     3c509$(LIB_VARIANT).rel
    245 endif
    246 libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \
    247     ../../../libcpu/i386/page$(LIB_VARIANT).rel \
    248     ../../../libcpu/i386/score$(LIB_VARIANT).rel
    249 
    250 EXTRA_LIBRARIES += libbsp_g.a
    251 CLEANFILES += libbsp_g.a
    252 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    253 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    254 
    255 noinst_DATA += libbsp$(LIB_VARIANT).a
     142libbsp_a_LIBADD += ne2000.rel wd8003.rel 3c509.rel
     143endif
     144libbsp_a_LIBADD += ../../../libcpu/i386/cache.rel \
     145    ../../../libcpu/i386/page.rel ../../../libcpu/i386/score.rel
    256146
    257147all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    297187PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    298188
    299 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    300         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    301 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    302 
    303 $(PROJECT_LIB)/start16$(LIB_VARIANT).bin: start16$(LIB_VARIANT).bin $(PROJECT_LIB)/$(dirstamp)
    304         $(INSTALL_DATA) $< $(PROJECT_LIB)/start16$(LIB_VARIANT).bin
    305 TMPINSTALL_FILES += $(PROJECT_LIB)/start16$(LIB_VARIANT).bin
     189$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     190        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     191TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
     192
     193$(PROJECT_LIB)/start16.bin: start16.bin $(PROJECT_LIB)/$(dirstamp)
     194        $(INSTALL_DATA) $< $(PROJECT_LIB)/start16.bin
     195TMPINSTALL_FILES += $(PROJECT_LIB)/start16.bin
    306196
    307197$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    340230endif
    341231
    342 CLEANFILES += $(PREINSTALL_FILES)
    343 DISTCLEANFILES = $(PREINSTALL_DIRS)
     232CLEANFILES = $(PREINSTALL_FILES)
     233DISTCLEANFILES += $(PREINSTALL_DIRS)
    344234CLEANFILES += $(TMPINSTALL_FILES)
    345235
  • c/src/lib/libbsp/i386/ts_386ex/ChangeLog

    r7722eff7 r4cbf22a  
     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/i386/ts_386ex/Makefile.am

    r7722eff7 r4cbf22a  
    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
    2020# wrapup is the one that actually builds and installs the library
     
    2727    start/ts_1325.inc
    2828EXTRA_DIST = start/start.S
    29 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     29start.$(OBJEXT): start/start.S
    3030        $(CPPASCOMPILE) -DASM -o $@ -c $<
    3131
    32 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     32project_lib_DATA = start.$(OBJEXT)
    3333
    3434dist_project_lib_DATA += startup/linkcmds
    3535
    36 EXTRA_PROGRAMS += startup.rel
    37 CLEANFILES += startup.rel
     36noinst_PROGRAMS += startup.rel
    3837startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
    3938    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    4746startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4847
    49 EXTRA_PROGRAMS += startup_g.rel
    50 CLEANFILES += startup_g.rel
    51 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    52 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    53 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    54 
    55 noinst_DATA += startup$(LIB_VARIANT).rel
    56 
    57 EXTRA_PROGRAMS += clock.rel
    58 CLEANFILES += clock.rel
     48noinst_PROGRAMS += clock.rel
    5949clock_rel_SOURCES = clock/ckinit.c clock/rtc.c
    6050clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6151clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6252
    63 EXTRA_PROGRAMS += clock_g.rel
    64 CLEANFILES += clock_g.rel
    65 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    66 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    67 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    68 
    69 noinst_DATA += clock$(LIB_VARIANT).rel
    70 
    71 EXTRA_PROGRAMS += console.rel
    72 CLEANFILES += console.rel
     53noinst_PROGRAMS += console.rel
    7354console_rel_SOURCES = console/console.c
    7455console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7556console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7657
    77 EXTRA_PROGRAMS += console_g.rel
    78 CLEANFILES += console_g.rel
    79 console_g_rel_SOURCES = $(console_rel_SOURCES)
    80 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    81 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    82 
    83 noinst_DATA += console$(LIB_VARIANT).rel
    84 
    85 EXTRA_PROGRAMS += timer.rel
    86 CLEANFILES += timer.rel
     58noinst_PROGRAMS += timer.rel
    8759timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    8860timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8961timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    90 
    91 EXTRA_PROGRAMS += timer_g.rel
    92 CLEANFILES += timer_g.rel
    93 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    94 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    95 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    96 
    97 noinst_DATA += timer$(LIB_VARIANT).rel
    9862
    9963if HAS_NETWORKING
     
    10367# FIXME: Do we really need these flags?
    10468network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    105 EXTRA_PROGRAMS += network.rel
    106 CLEANFILES += network.rel
     69noinst_PROGRAMS += network.rel
    10770network_rel_SOURCES = network/ne2000.c network/wd80x3.h
    10871network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     
    11073network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    11174
    112 EXTRA_PROGRAMS += network_g.rel
    113 CLEANFILES += network_g.rel
    114 network_g_rel_SOURCES = $(network_rel_SOURCES)
    115 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    11675    $(network_CPPFLAGS)
    117 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    118 
    119 noinst_DATA += network$(LIB_VARIANT).rel
    12076endif
    12177
    122 EXTRA_LIBRARIES = libbsp.a
    123 CLEANFILES += libbsp.a
     78noinst_LIBRARIES = libbsp.a
    12479libbsp_a_SOURCES =
    125 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    126     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     80libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
    12781if HAS_NETWORKING
    128 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     82libbsp_a_LIBADD += network.rel
    12983endif
    130 libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \
    131     ../../../libcpu/i386/score$(LIB_VARIANT).rel
    132 
    133 EXTRA_LIBRARIES += libbsp_g.a
    134 CLEANFILES += libbsp_g.a
    135 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    136 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    137 
    138 noinst_DATA += libbsp$(LIB_VARIANT).a
     84libbsp_a_LIBADD += ../../../libcpu/i386/cache.rel \
     85    ../../../libcpu/i386/score.rel
    13986
    14087all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    174121PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    175122
    176 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    177         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    178 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     123$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     124        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     125TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    179126
    180127$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    188135endif
    189136
    190 CLEANFILES += $(PREINSTALL_FILES)
    191 DISTCLEANFILES = $(PREINSTALL_DIRS)
     137CLEANFILES = $(PREINSTALL_FILES)
     138DISTCLEANFILES += $(PREINSTALL_DIRS)
    192139CLEANFILES += $(TMPINSTALL_FILES)
    193140
  • c/src/lib/libbsp/m68k/csb360/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/csb360/Makefile.am

    r7722eff7 r4cbf22a  
    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
     
    2323
    2424EXTRA_DIST += start/start.S
    25 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     25start.$(OBJEXT): start/start.S
    2626        $(CPPASCOMPILE) -DASM -o $@ -c $<
    2727
    28 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     28project_lib_DATA = start.$(OBJEXT)
    2929
    3030dist_project_lib_DATA += startup/linkcmds
    3131
    32 EXTRA_PROGRAMS += startup.rel
    33 CLEANFILES += startup.rel
     32noinst_PROGRAMS += startup.rel
    3433startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3534    ../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \
     
    4039startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4140
    42 EXTRA_PROGRAMS += startup_g.rel
    43 CLEANFILES += startup_g.rel
    44 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    45 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    46 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    47 
    48 noinst_DATA += startup$(LIB_VARIANT).rel
    49 
    5041# console
    51 EXTRA_PROGRAMS += console.rel
    52 CLEANFILES += console.rel
     42noinst_PROGRAMS += console.rel
    5343console_rel_SOURCES = console/console-io.c ../../shared/console-polled.c
    5444console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5545console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5646
    57 EXTRA_PROGRAMS += console_g.rel
    58 CLEANFILES += console_g.rel
    59 console_g_rel_SOURCES = $(console_rel_SOURCES)
    60 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    61 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    62 
    63 noinst_DATA += console$(LIB_VARIANT).rel
    64 
    65 EXTRA_LIBRARIES = libbsp.a
    66 CLEANFILES += libbsp.a
     47noinst_LIBRARIES = libbsp.a
    6748libbsp_a_SOURCES =
    68 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel
    69 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \
    70     ../../../libcpu/@RTEMS_CPU@/mcf5272/clock$(LIB_VARIANT).rel \
    71     ../../../libcpu/@RTEMS_CPU@/mcf5272/timer$(LIB_VARIANT).rel
    72 
    73 EXTRA_LIBRARIES += libbsp_g.a
    74 CLEANFILES += libbsp_g.a
    75 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    76 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    77 
    78 noinst_DATA += libbsp$(LIB_VARIANT).a
     49libbsp_a_LIBADD = startup.rel console.rel
     50libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \
     51    ../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \
     52    ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel
    7953
    8054all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    11488PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    11589
    116 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    117         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    118 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     90$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     91        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     92TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    11993
    12094$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    12296PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    12397
    124 CLEANFILES += $(PREINSTALL_FILES)
    125 DISTCLEANFILES = $(PREINSTALL_DIRS)
     98CLEANFILES = $(PREINSTALL_FILES)
     99DISTCLEANFILES += $(PREINSTALL_DIRS)
    126100CLEANFILES += $(TMPINSTALL_FILES)
    127101
  • c/src/lib/libbsp/m68k/dmv152/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/dmv152/Makefile.am

    r7722eff7 r4cbf22a  
    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 = ../../m68k/shared/start.S
    23 start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S
     23start.$(OBJEXT): ../../m68k/shared/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 += clock.rel
    48 CLEANFILES += clock.rel
     38noinst_PROGRAMS += clock.rel
    4939clock_rel_SOURCES = clock/ckinit.c
    5040clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5141clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5242
    53 EXTRA_PROGRAMS += clock_g.rel
    54 CLEANFILES += clock_g.rel
    55 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    56 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    57 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    58 
    59 noinst_DATA += clock$(LIB_VARIANT).rel
    60 
    61 EXTRA_PROGRAMS += console.rel
    62 CLEANFILES += console.rel
     43noinst_PROGRAMS += console.rel
    6344console_rel_SOURCES = console/console.c
    6445console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6546console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6647
    67 EXTRA_PROGRAMS += console_g.rel
    68 CLEANFILES += console_g.rel
    69 console_g_rel_SOURCES = $(console_rel_SOURCES)
    70 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    71 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    72 
    73 noinst_DATA += console$(LIB_VARIANT).rel
    74 
    75 EXTRA_PROGRAMS += spurious.rel
    76 CLEANFILES += spurious.rel
     48noinst_PROGRAMS += spurious.rel
    7749spurious_rel_SOURCES = spurious/spinit.c
    7850spurious_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7951spurious_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8052
    81 EXTRA_PROGRAMS += spurious_g.rel
    82 CLEANFILES += spurious_g.rel
    83 spurious_g_rel_SOURCES = $(spurious_rel_SOURCES)
    84 spurious_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    85 spurious_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    86 
    87 noinst_DATA += spurious$(LIB_VARIANT).rel
    88 
    89 EXTRA_PROGRAMS += timer.rel
    90 CLEANFILES += timer.rel
     53noinst_PROGRAMS += timer.rel
    9154timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    9255timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9356timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9457
    95 EXTRA_PROGRAMS += timer_g.rel
    96 CLEANFILES += timer_g.rel
    97 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    98 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    99 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    100 
    101 noinst_DATA += timer$(LIB_VARIANT).rel
    102 
    103 EXTRA_LIBRARIES = libbsp.a
    104 CLEANFILES += libbsp.a
     58noinst_LIBRARIES = libbsp.a
    10559libbsp_a_SOURCES =
    106 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    107     console$(LIB_VARIANT).rel spurious$(LIB_VARIANT).rel \
    108     timer$(LIB_VARIANT).rel
    109 libbsp_a_LIBADD += \
    110     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    111     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    112 
    113 EXTRA_LIBRARIES += libbsp_g.a
    114 CLEANFILES += libbsp_g.a
    115 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    116 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    117 
    118 noinst_DATA += libbsp$(LIB_VARIANT).a
     60libbsp_a_LIBADD = startup.rel clock.rel console.rel spurious.rel timer.rel
     61libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     62    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    11963
    12064all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    156100PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    157101
    158 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    159         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    160 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     102$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     103        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     104TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    161105
    162106$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    164108PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    165109
    166 CLEANFILES += $(PREINSTALL_FILES)
    167 DISTCLEANFILES = $(PREINSTALL_DIRS)
     110CLEANFILES = $(PREINSTALL_FILES)
     111DISTCLEANFILES += $(PREINSTALL_DIRS)
    168112CLEANFILES += $(TMPINSTALL_FILES)
    169113
  • c/src/lib/libbsp/m68k/gen68302/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/gen68302/Makefile.am

    r7722eff7 r4cbf22a  
    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
     
    2424
    2525EXTRA_DIST += start/start.S
    26 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     26start.$(OBJEXT): start/start.S
    2727        $(CPPASCOMPILE) -DASM -o $@ -c $<
    28 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     28project_lib_DATA = start.$(OBJEXT)
    2929
    3030dist_project_lib_DATA += startup/linkcmds
    3131
    32 EXTRA_PROGRAMS += startup.rel
    33 CLEANFILES += startup.rel
     32noinst_PROGRAMS += startup.rel
    3433startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3534    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    4039startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4140
    42 EXTRA_PROGRAMS += startup_g.rel
    43 CLEANFILES += startup_g.rel
    44 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    45 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    46 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    47 
    48 noinst_DATA += startup$(LIB_VARIANT).rel
    49 
    50 EXTRA_PROGRAMS += clock.rel
    51 CLEANFILES += clock.rel
     41noinst_PROGRAMS += clock.rel
    5242clock_rel_SOURCES = clock/ckinit.c
    5343clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5444clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5545
    56 EXTRA_PROGRAMS += clock_g.rel
    57 CLEANFILES += clock_g.rel
    58 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    59 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    60 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    61 
    62 noinst_DATA += clock$(LIB_VARIANT).rel
    63 
    64 EXTRA_PROGRAMS += console.rel
    65 CLEANFILES += console.rel
     46noinst_PROGRAMS += console.rel
    6647console_rel_SOURCES = console/console.c
    6748console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6849console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6950
    70 EXTRA_PROGRAMS += console_g.rel
    71 CLEANFILES += console_g.rel
    72 console_g_rel_SOURCES = $(console_rel_SOURCES)
    73 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    74 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    75 
    76 noinst_DATA += console$(LIB_VARIANT).rel
    77 
    78 EXTRA_PROGRAMS += timer.rel
    79 CLEANFILES += timer.rel
     51noinst_PROGRAMS += timer.rel
    8052timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    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 
    9256if HAS_NETWORKING
    9357network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    94 EXTRA_PROGRAMS += network.rel
    95 CLEANFILES += network.rel
     58noinst_PROGRAMS += network.rel
    9659network_rel_SOURCES = network/network.c
    9760network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    9861    $(network_CPPFLAGS)
    9962network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    100 
    101 EXTRA_PROGRAMS += network_g.rel
    102 CLEANFILES += network_g.rel
    103 network_g_rel_SOURCES = $(network_rel_SOURCES)
    104 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    105     $(network_CPPFLAGS)
    106 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    107 
    108 noinst_DATA += network$(LIB_VARIANT).rel
    10963endif
    11064
    111 EXTRA_LIBRARIES = libbsp.a
    112 CLEANFILES += libbsp.a
     65noinst_LIBRARIES = libbsp.a
    11366libbsp_a_SOURCES =
    114 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    115     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     67libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
    11668if HAS_NETWORKING
    117 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     69libbsp_a_LIBADD += network.rel
    11870endif
    119 libbsp_a_LIBADD += \
    120     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    121     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    122 
    123 EXTRA_LIBRARIES += libbsp_g.a
    124 CLEANFILES += libbsp_g.a
    125 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    126 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    127 
    128 noinst_DATA += libbsp$(LIB_VARIANT).a
     71libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     72    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    12973
    13074all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    168112PREINSTALL_FILES += $(PROJECT_INCLUDE)/m302_int.h
    169113
    170 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    171         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    172 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     114$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     115        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     116TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    173117
    174118$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    176120PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    177121
    178 CLEANFILES += $(PREINSTALL_FILES)
    179 DISTCLEANFILES = $(PREINSTALL_DIRS)
     122CLEANFILES = $(PREINSTALL_FILES)
     123DISTCLEANFILES += $(PREINSTALL_DIRS)
    180124CLEANFILES += $(TMPINSTALL_FILES)
    181125
  • c/src/lib/libbsp/m68k/gen68340/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/gen68340/Makefile.am

    r7722eff7 r4cbf22a  
    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
     
    2626
    2727EXTRA_DIST = start/start.S start/startfor340only.S
    28 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     28start.$(OBJEXT): start/start.S
    2929        $(CPPASCOMPILE) -DASM -o $@ -c $<
    30 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     30project_lib_DATA = start.$(OBJEXT)
    3131
    3232dist_project_lib_DATA += startup/linkcmds
    3333
    34 EXTRA_PROGRAMS += startup.rel
    35 CLEANFILES += startup.rel
     34noinst_PROGRAMS += startup.rel
    3635startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3736    ../../shared/bsppost.c startup/bspstart.c startup/init68340.c \
     
    4241startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4342
    44 EXTRA_PROGRAMS += startup_g.rel
    45 CLEANFILES += startup_g.rel
    46 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    47 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    48 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    49 
    50 noinst_DATA += startup$(LIB_VARIANT).rel
    51 
    52 EXTRA_PROGRAMS += clock.rel
    53 CLEANFILES += clock.rel
     43noinst_PROGRAMS += clock.rel
    5444clock_rel_SOURCES = clock/ckinit.c
    5545clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5646clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5747
    58 EXTRA_PROGRAMS += clock_g.rel
    59 CLEANFILES += clock_g.rel
    60 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    61 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    62 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    63 
    64 noinst_DATA += clock$(LIB_VARIANT).rel
    65 
    66 EXTRA_PROGRAMS += console.rel
    67 CLEANFILES += console.rel
     48noinst_PROGRAMS += console.rel
    6849console_rel_SOURCES = console/Modif_cpu_asm.S console/console.c \
    6950    console/m340uart.c
     
    7152console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7253
    73 EXTRA_PROGRAMS += console_g.rel
    74 CLEANFILES += console_g.rel
    75 console_g_rel_SOURCES = $(console_rel_SOURCES)
    76 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    77 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    78 
    79 noinst_DATA += console$(LIB_VARIANT).rel
    80 
    81 EXTRA_PROGRAMS += timer.rel
    82 CLEANFILES += timer.rel
     54noinst_PROGRAMS += timer.rel
    8355timer_rel_SOURCES = timer/timer.c
    8456timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8557timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8658
    87 EXTRA_PROGRAMS += timer_g.rel
    88 CLEANFILES += timer_g.rel
    89 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    90 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    91 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    92 
    93 noinst_DATA += timer$(LIB_VARIANT).rel
    94 
    95 EXTRA_LIBRARIES = libbsp.a
    96 CLEANFILES += libbsp.a
     59noinst_LIBRARIES = libbsp.a
    9760libbsp_a_SOURCES =
    98 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    99     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
    100 libbsp_a_LIBADD += \
    101     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    102     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    103 
    104 EXTRA_LIBRARIES += libbsp_g.a
    105 CLEANFILES += libbsp_g.a
    106 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    107 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    108 
    109 noinst_DATA += libbsp$(LIB_VARIANT).a
     61libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
     62libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     63    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    11064
    11165all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    165119PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68349.inc
    166120
    167 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    168         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    169 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     121$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     122        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     123TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    170124
    171125$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    173127PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    174128
    175 CLEANFILES += $(PREINSTALL_FILES)
    176 DISTCLEANFILES = $(PREINSTALL_DIRS)
     129CLEANFILES = $(PREINSTALL_FILES)
     130DISTCLEANFILES += $(PREINSTALL_DIRS)
    177131CLEANFILES += $(TMPINSTALL_FILES)
    178132
  • c/src/lib/libbsp/m68k/gen68360/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/gen68360/Makefile.am

    r7722eff7 r4cbf22a  
    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 startup/linkcmds.prom \
    2828    startup/linkcmds.bootp
    2929
    30 EXTRA_PROGRAMS += startup.rel
    31 CLEANFILES += startup.rel
     30noinst_PROGRAMS += startup.rel
    3231startup_rel_SOURCES = startup/alloc360.c startup/bspclean.c \
    3332    ../../shared/bsplibc.c ../../shared/bsppost.c \
     
    3938startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4039
    41 EXTRA_PROGRAMS += startup_g.rel
    42 CLEANFILES += startup_g.rel
    43 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    44 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    45 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    46 
    47 noinst_DATA += startup$(LIB_VARIANT).rel
    48 
    49 EXTRA_PROGRAMS += clock.rel
    50 CLEANFILES += clock.rel
     40noinst_PROGRAMS += clock.rel
    5141clock_rel_SOURCES = clock/clock.c
    5242clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5343clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5444
    55 EXTRA_PROGRAMS += clock_g.rel
    56 CLEANFILES += clock_g.rel
    57 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    58 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    59 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    60 
    61 noinst_DATA += clock$(LIB_VARIANT).rel
    62 
    63 EXTRA_PROGRAMS += console.rel
    64 CLEANFILES += console.rel
     45noinst_PROGRAMS += console.rel
    6546console_rel_SOURCES = console/console.c console/consolereserveresources.c
    6647console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6748console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6849
    69 EXTRA_PROGRAMS += console_g.rel
    70 CLEANFILES += console_g.rel
    71 console_g_rel_SOURCES = $(console_rel_SOURCES)
    72 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    73 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    74 
    75 noinst_DATA += console$(LIB_VARIANT).rel
    76 
    77 EXTRA_PROGRAMS += timer.rel
    78 CLEANFILES += timer.rel
     50noinst_PROGRAMS += timer.rel
    7951timer_rel_SOURCES = timer/timer.c
    8052timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8153timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8254
    83 EXTRA_PROGRAMS += timer_g.rel
    84 CLEANFILES += timer_g.rel
    85 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    86 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    87 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    88 
    89 noinst_DATA += timer$(LIB_VARIANT).rel
    90 
    9155if HAS_NETWORKING
    9256network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    93 EXTRA_PROGRAMS += network.rel
    94 CLEANFILES += network.rel
     57noinst_PROGRAMS += network.rel
    9558network_rel_SOURCES = network/network.c
    9659network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    9760    $(network_CPPFLAGS)
    9861network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    99 
    100 EXTRA_PROGRAMS += network_g.rel
    101 CLEANFILES += network_g.rel
    102 network_g_rel_SOURCES = $(network_rel_SOURCES)
    103 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    104     $(network_CPPFLAGS)
    105 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    106 
    107 noinst_DATA += network$(LIB_VARIANT).rel
    10862endif
    10963
    110 EXTRA_LIBRARIES = libbsp.a
    111 CLEANFILES += libbsp.a
     64noinst_LIBRARIES = libbsp.a
    11265libbsp_a_SOURCES =
    113 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    114     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     66libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
    11567if HAS_NETWORKING
    116 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     68libbsp_a_LIBADD += network.rel
    11769endif
    118 libbsp_a_LIBADD += \
    119     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    120     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
     70libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     71    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    12172if HAS_FPSP
    122 libbsp_a_LIBADD += \
    123     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel
     73libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel
    12474endif
    125 
    126 EXTRA_LIBRARIES += libbsp_g.a
    127 CLEANFILES += libbsp_g.a
    128 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    129 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    130 
    131 noinst_DATA += libbsp$(LIB_VARIANT).a
    13275
    13376all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    167110PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    168111
    169 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    170         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    171 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     112$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     113        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     114TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    172115
    173116$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    183126PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.bootp
    184127
    185 CLEANFILES += $(PREINSTALL_FILES)
    186 DISTCLEANFILES = $(PREINSTALL_DIRS)
     128CLEANFILES = $(PREINSTALL_FILES)
     129DISTCLEANFILES += $(PREINSTALL_DIRS)
    187130CLEANFILES += $(TMPINSTALL_FILES)
    188131
  • c/src/lib/libbsp/m68k/idp/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152005-01-02      Ralf Corsepius <ralf_corsepius@rtems.org>
    26
  • c/src/lib/libbsp/m68k/idp/Makefile.am

    r7722eff7 r4cbf22a  
    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/leds.h
     
    2222
    2323EXTRA_DIST = ../../m68k/shared/start.S
    24 start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S
     24start.$(OBJEXT): ../../m68k/shared/start.S
    2525        $(CPPASCOMPILE) -DASM -o $@ -c $<
    26 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     26project_lib_DATA = start.$(OBJEXT)
    2727
    2828dist_project_lib_DATA += startup/linkcmds
    2929
    30 EXTRA_PROGRAMS += startup.rel
    31 CLEANFILES += startup.rel
     30noinst_PROGRAMS += startup.rel
    3231startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
    3332    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    3837startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3938
    40 EXTRA_PROGRAMS += startup_g.rel
    41 CLEANFILES += startup_g.rel
    42 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    43 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    44 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    45 
    46 noinst_DATA += startup$(LIB_VARIANT).rel
    47 
    48 EXTRA_PROGRAMS += clock.rel
    49 CLEANFILES += clock.rel
     39noinst_PROGRAMS += clock.rel
    5040clock_rel_SOURCES = clock/ckinit.c
    5141clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5242clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5343
    54 EXTRA_PROGRAMS += clock_g.rel
    55 CLEANFILES += clock_g.rel
    56 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    57 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    58 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    59 
    60 noinst_DATA += clock$(LIB_VARIANT).rel
    61 
    62 EXTRA_PROGRAMS += console.rel
    63 CLEANFILES += console.rel
     44noinst_PROGRAMS += console.rel
    6445console_rel_SOURCES = console/console.c console/leds.c console/mc68ec.c \
    6546    console/duart.c
     
    6748console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6849
    69 EXTRA_PROGRAMS += console_g.rel
    70 CLEANFILES += console_g.rel
    71 console_g_rel_SOURCES = $(console_rel_SOURCES)
    72 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    73 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    74 
    75 noinst_DATA += console$(LIB_VARIANT).rel
    76 
    77 EXTRA_PROGRAMS += timer.rel
    78 CLEANFILES += timer.rel
     50noinst_PROGRAMS += timer.rel
    7951timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    8052timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8153timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8254
    83 EXTRA_PROGRAMS += timer_g.rel
    84 CLEANFILES += timer_g.rel
    85 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    86 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    87 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    88 
    89 noinst_DATA += timer$(LIB_VARIANT).rel
    90 
    9155EXTRA_DIST += include/README
    9256EXTRA_DIST += times
    9357
    94 EXTRA_LIBRARIES = libbsp.a
    95 CLEANFILES += libbsp.a
     58noinst_LIBRARIES = libbsp.a
    9659libbsp_a_SOURCES =
    97 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    98     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
    99 libbsp_a_LIBADD += \
    100     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    101     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    102 
    103 EXTRA_LIBRARIES += libbsp_g.a
    104 CLEANFILES += libbsp_g.a
    105 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    106 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    107 
    108 noinst_DATA += libbsp$(LIB_VARIANT).a
     60libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
     61libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     62    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    10963
    11064all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    148102PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    149103
    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)
     104$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     105        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     106TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    153107
    154108$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    156110PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    157111
    158 CLEANFILES += $(PREINSTALL_FILES)
    159 DISTCLEANFILES = $(PREINSTALL_DIRS)
     112CLEANFILES = $(PREINSTALL_FILES)
     113DISTCLEANFILES += $(PREINSTALL_DIRS)
    160114CLEANFILES += $(TMPINSTALL_FILES)
    161115
  • c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am

    r7722eff7 r4cbf22a  
    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
    2020SUBDIRS = . tools
     
    3030
    3131EXTRA_DIST += start/start.S
    32 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     32start.$(OBJEXT): start/start.S
    3333        $(CPPASCOMPILE) -DASM -o $@ -c $<
    3434
    35 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     35project_lib_DATA = start.$(OBJEXT)
    3636
    3737dist_project_lib_DATA += startup/linkcmds startup/gdbinit \
    3838    startup/linkcmds.flash
    3939
    40 EXTRA_PROGRAMS += startup.rel
    41 CLEANFILES += startup.rel
     40noinst_PROGRAMS += startup.rel
    4241startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    4342    ../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \
     
    4847startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4948
    50 EXTRA_PROGRAMS += startup_g.rel
    51 CLEANFILES += startup_g.rel
    52 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    53 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    54 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    55 
    56 noinst_DATA += startup$(LIB_VARIANT).rel
    57 
    58 EXTRA_PROGRAMS += console.rel
    59 CLEANFILES += console.rel
     49noinst_PROGRAMS += console.rel
    6050console_rel_SOURCES = console/console.c
    6151console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6252console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6353
    64 EXTRA_PROGRAMS += console_g.rel
    65 CLEANFILES += console_g.rel
    66 console_g_rel_SOURCES = $(console_rel_SOURCES)
    67 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    68 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    69 
    70 noinst_DATA += console$(LIB_VARIANT).rel
    71 
    72 EXTRA_PROGRAMS += i2c.rel
    73 CLEANFILES += i2c.rel
     54noinst_PROGRAMS += i2c.rel
    7455i2c_rel_SOURCES = i2c/i2c.c i2c/i2cdrv.c
    7556i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7657i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7758
    78 EXTRA_PROGRAMS += i2c_g.rel
    79 CLEANFILES += i2c_g.rel
    80 i2c_g_rel_SOURCES = $(i2c_rel_SOURCES)
    81 i2c_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    82 i2c_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    83 
    84 noinst_DATA += i2c$(LIB_VARIANT).rel
    85 
    86 EXTRA_PROGRAMS += tod.rel
    87 CLEANFILES += tod.rel
     59noinst_PROGRAMS += tod.rel
    8860tod_rel_SOURCES = tod/ds1307.c tod/todcfg.c ../../shared/tod.c
    8961tod_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9062tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9163
    92 EXTRA_PROGRAMS += tod_g.rel
    93 CLEANFILES += tod_g.rel
    94 tod_g_rel_SOURCES = $(tod_rel_SOURCES)
    95 tod_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    96 tod_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    97 
    98 noinst_DATA += tod$(LIB_VARIANT).rel
    99 
    100 EXTRA_PROGRAMS += nvram.rel
    101 CLEANFILES += nvram.rel
     64noinst_PROGRAMS += nvram.rel
    10265nvram_rel_SOURCES = nvram/nvram.c
    10366nvram_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    10467nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    10568
    106 EXTRA_PROGRAMS += nvram_g.rel
    107 CLEANFILES += nvram_g.rel
    108 nvram_g_rel_SOURCES = $(nvram_rel_SOURCES)
    109 nvram_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    110 nvram_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    111 
    112 noinst_DATA += nvram$(LIB_VARIANT).rel
    113 
    114 EXTRA_LIBRARIES = libbsp.a
    115 CLEANFILES += libbsp.a
     69noinst_LIBRARIES = libbsp.a
    11670libbsp_a_SOURCES =
    117 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
    118     i2c$(LIB_VARIANT).rel tod$(LIB_VARIANT).rel nvram$(LIB_VARIANT).rel
    119 libbsp_a_LIBADD += \
    120     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    121     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \
    122     ../../../libcpu/@RTEMS_CPU@/mcf5206/clock$(LIB_VARIANT).rel \
    123     ../../../libcpu/@RTEMS_CPU@/mcf5206/mcfuart$(LIB_VARIANT).rel \
    124     ../../../libcpu/@RTEMS_CPU@/mcf5206/timer$(LIB_VARIANT).rel \
    125     ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus$(LIB_VARIANT).rel
    126 
    127 EXTRA_LIBRARIES += libbsp_g.a
    128 CLEANFILES += libbsp_g.a
    129 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    130 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    131 
    132 noinst_DATA += libbsp$(LIB_VARIANT).a
     71libbsp_a_LIBADD = startup.rel console.rel i2c.rel tod.rel nvram.rel
     72libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     73    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \
     74    ../../../libcpu/@RTEMS_CPU@/mcf5206/clock.rel \
     75    ../../../libcpu/@RTEMS_CPU@/mcf5206/mcfuart.rel \
     76    ../../../libcpu/@RTEMS_CPU@/mcf5206/timer.rel \
     77    ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel
    13378
    13479all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    188133PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h
    189134
    190 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    191         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    192 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     135$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     136        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     137TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    193138
    194139$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    204149PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.flash
    205150
    206 CLEANFILES += $(PREINSTALL_FILES)
    207 DISTCLEANFILES = $(PREINSTALL_DIRS)
     151CLEANFILES = $(PREINSTALL_FILES)
     152DISTCLEANFILES += $(PREINSTALL_DIRS)
    208153CLEANFILES += $(TMPINSTALL_FILES)
    209154
  • c/src/lib/libbsp/m68k/mrm332/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/mrm332/Makefile.am

    r7722eff7 r4cbf22a  
    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/mrm332.h
     
    2424
    2525EXTRA_DIST += start/start.S
    26 start$(LIB_VARIANT).$(OBJEXT): start/start.S
     26start.$(OBJEXT): start/start.S
    2727        $(CPPASCOMPILE) -DASM -o $@ -c $<
    2828
    29 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     29project_lib_DATA = start.$(OBJEXT)
    3030
    3131dist_project_lib_DATA += startup/linkcmds startup/linkcmds_ROM
    3232
    33 EXTRA_PROGRAMS += startup.rel
    34 CLEANFILES += startup.rel
     33noinst_PROGRAMS += startup.rel
    3534startup_rel_SOURCES = startup/start_c.c ../../shared/bsplibc.c \
    3635    ../../shared/bsppost.c startup/bspstart.c startup/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)
    47 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    48 
    49 noinst_DATA += startup$(LIB_VARIANT).rel
    50 
    51 EXTRA_PROGRAMS += clock.rel
    52 CLEANFILES += clock.rel
     42noinst_PROGRAMS += clock.rel
    5343clock_rel_SOURCES = clock/ckinit.c
    5444clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5545clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5646
    57 EXTRA_PROGRAMS += clock_g.rel
    58 CLEANFILES += clock_g.rel
    59 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    60 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    61 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    62 
    63 noinst_DATA += clock$(LIB_VARIANT).rel
    64 
    65 EXTRA_PROGRAMS += console.rel
    66 CLEANFILES += console.rel
     47noinst_PROGRAMS += console.rel
    6748console_rel_SOURCES = console/console.c console/sci.c console/sci.h
    6849console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6950console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7051
    71 EXTRA_PROGRAMS += console_g.rel
    72 CLEANFILES += console_g.rel
    73 console_g_rel_SOURCES = $(console_rel_SOURCES)
    74 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    75 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    76 
    77 noinst_DATA += console$(LIB_VARIANT).rel
    78 
    79 EXTRA_PROGRAMS += spurious.rel
    80 CLEANFILES += spurious.rel
     52noinst_PROGRAMS += spurious.rel
    8153spurious_rel_SOURCES = spurious/spinit.c
    8254spurious_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8355spurious_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8456
    85 EXTRA_PROGRAMS += spurious_g.rel
    86 CLEANFILES += spurious_g.rel
    87 spurious_g_rel_SOURCES = $(spurious_rel_SOURCES)
    88 spurious_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    89 spurious_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    90 
    91 noinst_DATA += spurious$(LIB_VARIANT).rel
    92 
    93 EXTRA_PROGRAMS += timer.rel
    94 CLEANFILES += timer.rel
     57noinst_PROGRAMS += timer.rel
    9558timer_rel_SOURCES = timer/timer.c
    9659timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9760timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9861
    99 EXTRA_PROGRAMS += timer_g.rel
    100 CLEANFILES += timer_g.rel
    101 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    102 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    103 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    104 
    105 noinst_DATA += timer$(LIB_VARIANT).rel
    106 
    107 EXTRA_LIBRARIES = libbsp.a
    108 CLEANFILES += libbsp.a
     62noinst_LIBRARIES = libbsp.a
    10963libbsp_a_SOURCES =
    110 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    111     console$(LIB_VARIANT).rel spurious$(LIB_VARIANT).rel \
    112     timer$(LIB_VARIANT).rel
    113 libbsp_a_LIBADD += \
    114     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    115     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    116 
    117 EXTRA_LIBRARIES += libbsp_g.a
    118 CLEANFILES += libbsp_g.a
    119 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    120 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    121 
    122 noinst_DATA += libbsp$(LIB_VARIANT).a
     64libbsp_a_LIBADD = startup.rel clock.rel console.rel spurious.rel timer.rel
     65libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     66    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    12367
    12468all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    162106PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    163107
    164 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    165         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    166 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     108$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     109        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     110TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    167111
    168112$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    174118PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds_ROM
    175119
    176 CLEANFILES += $(PREINSTALL_FILES)
    177 DISTCLEANFILES = $(PREINSTALL_DIRS)
     120CLEANFILES = $(PREINSTALL_FILES)
     121DISTCLEANFILES += $(PREINSTALL_DIRS)
    178122CLEANFILES += $(TMPINSTALL_FILES)
    179123
  • c/src/lib/libbsp/m68k/mvme136/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/mvme136/Makefile.am

    r7722eff7 r4cbf22a  
    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 = ../../m68k/shared/start.S
    23 start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S
     23start.$(OBJEXT): ../../m68k/shared/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
    30 EXTRA_PROGRAMS += startup.rel
    31 CLEANFILES += startup.rel
     30noinst_PROGRAMS += startup.rel
    3231startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3332    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    3837startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3938
    40 EXTRA_PROGRAMS += startup_g.rel
    41 CLEANFILES += startup_g.rel
    42 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    43 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    44 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    45 
    46 noinst_DATA += startup$(LIB_VARIANT).rel
    47 
    48 EXTRA_PROGRAMS += clock.rel
    49 CLEANFILES += clock.rel
     39noinst_PROGRAMS += clock.rel
    5040clock_rel_SOURCES = clock/ckinit.c
    5141clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5242clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5343
    54 EXTRA_PROGRAMS += clock_g.rel
    55 CLEANFILES += clock_g.rel
    56 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    57 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    58 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    59 
    60 noinst_DATA += clock$(LIB_VARIANT).rel
    61 
    62 EXTRA_PROGRAMS += console.rel
    63 CLEANFILES += console.rel
     44noinst_PROGRAMS += console.rel
    6445console_rel_SOURCES = console/console.c
    6546console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6647console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6748
    68 EXTRA_PROGRAMS += console_g.rel
    69 CLEANFILES += console_g.rel
    70 console_g_rel_SOURCES = $(console_rel_SOURCES)
    71 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    72 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    73 
    74 noinst_DATA += console$(LIB_VARIANT).rel
    75 
    76 EXTRA_PROGRAMS += timer.rel
    77 CLEANFILES += timer.rel
     49noinst_PROGRAMS += timer.rel
    7850timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    7951timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8052timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8153
    82 EXTRA_PROGRAMS += timer_g.rel
    83 CLEANFILES += timer_g.rel
    84 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    85 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    86 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    87 
    88 noinst_DATA += timer$(LIB_VARIANT).rel
    89 
    9054if HAS_MP
    91 EXTRA_PROGRAMS += shmsupp.rel
    92 CLEANFILES += shmsupp.rel
     55noinst_PROGRAMS += shmsupp.rel
    9356shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
    9457    shmsupp/mpisr.c
    9558shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9659shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    97 
    98 EXTRA_PROGRAMS += shmsupp_g.rel
    99 CLEANFILES += shmsupp_g.rel
    100 shmsupp_g_rel_SOURCES = $(shmsupp_rel_SOURCES)
    101 shmsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    102 shmsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    103 
    104 noinst_DATA += shmsupp$(LIB_VARIANT).rel
    10560endif
    10661
    107 EXTRA_LIBRARIES = libbsp.a
    108 CLEANFILES += libbsp.a
     62noinst_LIBRARIES = libbsp.a
    10963libbsp_a_SOURCES =
    110 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    111     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     64libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
    11265if HAS_MP
    113 libbsp_a_LIBADD += shmsupp$(LIB_VARIANT).rel
     66libbsp_a_LIBADD += shmsupp.rel
    11467endif
    115 libbsp_a_LIBADD += \
    116     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    117     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    118 
    119 EXTRA_LIBRARIES += libbsp_g.a
    120 CLEANFILES += libbsp_g.a
    121 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    122 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    123 
    124 noinst_DATA += libbsp$(LIB_VARIANT).a
     68libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     69    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    12570
    12671all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    162107PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    163108
    164 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    165         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    166 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     109$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     110        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     111TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    167112
    168113$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    170115PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    171116
    172 CLEANFILES += $(PREINSTALL_FILES)
    173 DISTCLEANFILES = $(PREINSTALL_DIRS)
     117CLEANFILES = $(PREINSTALL_FILES)
     118DISTCLEANFILES += $(PREINSTALL_DIRS)
    174119CLEANFILES += $(TMPINSTALL_FILES)
    175120
  • c/src/lib/libbsp/m68k/mvme147/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/mvme147/Makefile.am

    r7722eff7 r4cbf22a  
    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 = ../../m68k/shared/start.S
    23 start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S
     23start.$(OBJEXT): ../../m68k/shared/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
    30 EXTRA_PROGRAMS += startup.rel
    31 CLEANFILES += startup.rel
     30noinst_PROGRAMS += startup.rel
    3231startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3332    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    3837startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3938
    40 EXTRA_PROGRAMS += startup_g.rel
    41 CLEANFILES += startup_g.rel
    42 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    43 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    44 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    45 
    46 noinst_DATA += startup$(LIB_VARIANT).rel
    47 
    48 EXTRA_PROGRAMS += clock.rel
    49 CLEANFILES += clock.rel
     39noinst_PROGRAMS += clock.rel
    5040clock_rel_SOURCES = clock/ckinit.c
    5141clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5242clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5343
    54 EXTRA_PROGRAMS += clock_g.rel
    55 CLEANFILES += clock_g.rel
    56 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    57 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    58 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    59 
    60 noinst_DATA += clock$(LIB_VARIANT).rel
    61 
    62 EXTRA_PROGRAMS += console.rel
    63 CLEANFILES += console.rel
     44noinst_PROGRAMS += console.rel
    6445console_rel_SOURCES = console/console.c
    6546console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6647console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6748
    68 EXTRA_PROGRAMS += console_g.rel
    69 CLEANFILES += console_g.rel
    70 console_g_rel_SOURCES = $(console_rel_SOURCES)
    71 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    72 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    73 
    74 noinst_DATA += console$(LIB_VARIANT).rel
    75 
    76 EXTRA_PROGRAMS += timer.rel
    77 CLEANFILES += timer.rel
     49noinst_PROGRAMS += timer.rel
    7850timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    7951timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8052timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8153
    82 EXTRA_PROGRAMS += timer_g.rel
    83 CLEANFILES += timer_g.rel
    84 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    85 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    86 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    87 
    88 noinst_DATA += timer$(LIB_VARIANT).rel
    89 
    90 EXTRA_LIBRARIES = libbsp.a
    91 CLEANFILES += libbsp.a
     54noinst_LIBRARIES = libbsp.a
    9255libbsp_a_SOURCES =
    93 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    94     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
    95 libbsp_a_LIBADD += \
    96     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    97     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    98 
    99 EXTRA_LIBRARIES += libbsp_g.a
    100 CLEANFILES += libbsp_g.a
    101 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    102 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    103 
    104 noinst_DATA += libbsp$(LIB_VARIANT).a
     56libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
     57libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     58    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    10559
    10660all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    14296PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    14397
    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)
     98$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     99        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     100TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    147101
    148102$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    150104PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    151105
    152 CLEANFILES += $(PREINSTALL_FILES)
    153 DISTCLEANFILES = $(PREINSTALL_DIRS)
     106CLEANFILES = $(PREINSTALL_FILES)
     107DISTCLEANFILES += $(PREINSTALL_DIRS)
    154108CLEANFILES += $(TMPINSTALL_FILES)
    155109
  • c/src/lib/libbsp/m68k/mvme147s/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/mvme147s/Makefile.am

    r7722eff7 r4cbf22a  
    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 = ../../m68k/shared/start.S
    23 start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S
     23start.$(OBJEXT): ../../m68k/shared/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
    30 EXTRA_PROGRAMS += startup.rel
    31 CLEANFILES += startup.rel
     30noinst_PROGRAMS += startup.rel
    3231startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
    3332    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    3837startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3938
    40 EXTRA_PROGRAMS += startup_g.rel
    41 CLEANFILES += startup_g.rel
    42 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    43 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    44 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    45 
    46 noinst_DATA += startup$(LIB_VARIANT).rel
    47 
    48 EXTRA_PROGRAMS += clock.rel
    49 CLEANFILES += clock.rel
     39noinst_PROGRAMS += clock.rel
    5040clock_rel_SOURCES = ../mvme147/clock/ckinit.c
    5141clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5242clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5343
    54 EXTRA_PROGRAMS += clock_g.rel
    55 CLEANFILES += clock_g.rel
    56 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    57 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    58 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    59 
    60 noinst_DATA += clock$(LIB_VARIANT).rel
    61 
    62 EXTRA_PROGRAMS += console.rel
    63 CLEANFILES += console.rel
     44noinst_PROGRAMS += console.rel
    6445console_rel_SOURCES = ../mvme147/console/console.c
    6546console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6647console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6748
    68 EXTRA_PROGRAMS += console_g.rel
    69 CLEANFILES += console_g.rel
    70 console_g_rel_SOURCES = $(console_rel_SOURCES)
    71 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    72 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    73 
    74 noinst_DATA += console$(LIB_VARIANT).rel
    75 
    76 EXTRA_PROGRAMS += timer.rel
    77 CLEANFILES += timer.rel
     49noinst_PROGRAMS += timer.rel
    7850timer_rel_SOURCES = ../mvme147/timer/timer.c ../mvme147/timer/timerisr.S
    7951timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8052timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8153
    82 EXTRA_PROGRAMS += timer_g.rel
    83 CLEANFILES += timer_g.rel
    84 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    85 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    86 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    87 
    88 noinst_DATA += timer$(LIB_VARIANT).rel
    89 
    9054if HAS_MP
    91 EXTRA_PROGRAMS += shmsupp.rel
    92 CLEANFILES += shmsupp.rel
     55noinst_PROGRAMS += shmsupp.rel
    9356shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
    9457    shmsupp/mpisr.c
    9558shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9659shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    97 
    98 EXTRA_PROGRAMS += shmsupp_g.rel
    99 CLEANFILES += shmsupp_g.rel
    100 shmsupp_g_rel_SOURCES = $(shmsupp_rel_SOURCES)
    101 shmsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    102 shmsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    103 
    104 noinst_DATA += shmsupp$(LIB_VARIANT).rel
    10560endif
    10661
    107 EXTRA_LIBRARIES = libbsp.a
    108 CLEANFILES += libbsp.a
     62noinst_LIBRARIES = libbsp.a
    10963libbsp_a_SOURCES =
    110 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    111     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     64libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
    11265if HAS_MP
    113 libbsp_a_LIBADD += shmsupp$(LIB_VARIANT).rel
     66libbsp_a_LIBADD += shmsupp.rel
    11467endif
    115 libbsp_a_LIBADD += \
    116     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    117     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    118 
    119 EXTRA_LIBRARIES += libbsp_g.a
    120 CLEANFILES += libbsp_g.a
    121 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    122 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    123 
    124 noinst_DATA += libbsp$(LIB_VARIANT).a
     68libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     69    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    12570
    12671all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    162107PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    163108
    164 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    165         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    166 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     109$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     110        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     111TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    167112
    168113$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    170115PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    171116
    172 CLEANFILES += $(PREINSTALL_FILES)
    173 DISTCLEANFILES = $(PREINSTALL_DIRS)
     117CLEANFILES = $(PREINSTALL_FILES)
     118DISTCLEANFILES += $(PREINSTALL_DIRS)
    174119CLEANFILES += $(TMPINSTALL_FILES)
    175120
  • c/src/lib/libbsp/m68k/mvme162/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/mvme162/Makefile.am

    r7722eff7 r4cbf22a  
    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
    2020# wrapup is the one that actually builds and installs the library
     
    2929
    3030EXTRA_DIST = ../../m68k/shared/start.S
    31 start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S
     31start.$(OBJEXT): ../../m68k/shared/start.S
    3232        $(CPPASCOMPILE) -DASM -o $@ -c $<
    3333
    34 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     34project_lib_DATA = start.$(OBJEXT)
    3535
    3636dist_project_lib_DATA += startup/linkcmds
    3737
    38 EXTRA_PROGRAMS += startup.rel
    39 CLEANFILES += startup.rel
     38noinst_PROGRAMS += startup.rel
    4039startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    4140    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    4645startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4746
    48 EXTRA_PROGRAMS += startup_g.rel
    49 CLEANFILES += startup_g.rel
    50 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    51 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    52 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    53 
    54 noinst_DATA += startup$(LIB_VARIANT).rel
    55 
    56 EXTRA_PROGRAMS += clock.rel
    57 CLEANFILES += clock.rel
     47noinst_PROGRAMS += clock.rel
    5848clock_rel_SOURCES = clock/ckinit.c
    5949clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6050clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6151
    62 EXTRA_PROGRAMS += clock_g.rel
    63 CLEANFILES += clock_g.rel
    64 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    65 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    66 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    67 
    68 noinst_DATA += clock$(LIB_VARIANT).rel
    69 
    70 EXTRA_PROGRAMS += console.rel
    71 CLEANFILES += console.rel
     52noinst_PROGRAMS += console.rel
    7253console_rel_SOURCES = console/console.c
    7354console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7455console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7556
    76 EXTRA_PROGRAMS += console_g.rel
    77 CLEANFILES += console_g.rel
    78 console_g_rel_SOURCES = $(console_rel_SOURCES)
    79 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    80 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    81 
    82 noinst_DATA += console$(LIB_VARIANT).rel
    83 
    84 EXTRA_PROGRAMS += timer.rel
    85 CLEANFILES += timer.rel
     57noinst_PROGRAMS += timer.rel
    8658timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    8759timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8860timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8961
    90 EXTRA_PROGRAMS += timer_g.rel
    91 CLEANFILES += timer_g.rel
    92 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    93 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    94 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    95 
    96 noinst_DATA += timer$(LIB_VARIANT).rel
    97 
    98 EXTRA_PROGRAMS += tod.rel
    99 CLEANFILES += tod.rel
     62noinst_PROGRAMS += tod.rel
    10063tod_rel_SOURCES = tod/tod.c
    10164tod_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    10265tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    10366
    104 EXTRA_PROGRAMS += tod_g.rel
    105 CLEANFILES += tod_g.rel
    106 tod_g_rel_SOURCES = $(tod_rel_SOURCES)
    107 tod_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    108 tod_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    109 
    110 noinst_DATA += tod$(LIB_VARIANT).rel
    111 
    11267if HAS_NETWORKING
    11368network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    114 EXTRA_PROGRAMS += network.rel
    115 CLEANFILES += network.rel
     69noinst_PROGRAMS += network.rel
    11670network_rel_SOURCES = ../mvme167/network/network.c
    11771network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    11872    $(network_CPPFLAGS)
    11973network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    120 
    121 EXTRA_PROGRAMS += network_g.rel
    122 CLEANFILES += network_g.rel
    123 network_g_rel_SOURCES = $(network_rel_SOURCES)
    124 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    125     $(network_CPPFLAGS)
    126 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    127 
    128 noinst_DATA += network$(LIB_VARIANT).rel
    12974endif
    13075#--
    131 EXTRA_LIBRARIES = libbsp.a
    132 CLEANFILES += libbsp.a
     76noinst_LIBRARIES = libbsp.a
    13377libbsp_a_SOURCES =
    134 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    135     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel tod$(LIB_VARIANT).rel
     78libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel tod.rel
    13679if HAS_NETWORKING
    137 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     80libbsp_a_LIBADD += network.rel
    13881endif
    139 libbsp_a_LIBADD += \
    140     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    141     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
     82libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     83    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    14284if HAS_FPSP
    143 libbsp_a_LIBADD += \
    144     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel
     85libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel
    14586endif
    146 
    147 EXTRA_LIBRARIES += libbsp_g.a
    148 CLEANFILES += libbsp_g.a
    149 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    150 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    151 
    152 noinst_DATA += libbsp$(LIB_VARIANT).a
    15387
    15488all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    202136PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
    203137
    204 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    205         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    206 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     138$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     139        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     140TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    207141
    208142$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    210144PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    211145
    212 CLEANFILES += $(PREINSTALL_FILES)
    213 DISTCLEANFILES = $(PREINSTALL_DIRS)
     146CLEANFILES = $(PREINSTALL_FILES)
     147DISTCLEANFILES += $(PREINSTALL_DIRS)
    214148CLEANFILES += $(TMPINSTALL_FILES)
    215149
  • c/src/lib/libbsp/m68k/mvme167/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/mvme167/Makefile.am

    r7722eff7 r4cbf22a  
    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
     
    2525
    2626EXTRA_DIST = ../../m68k/shared/start.S
    27 start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S
     27start.$(OBJEXT): ../../m68k/shared/start.S
    2828        $(CPPASCOMPILE) -DASM -o $@ -c $<
    2929
    30 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     30project_lib_DATA = start.$(OBJEXT)
    3131
    3232dist_project_lib_DATA += startup/linkcmds
    3333
    34 EXTRA_PROGRAMS += startup.rel
    35 CLEANFILES += startup.rel
     34noinst_PROGRAMS += startup.rel
    3635startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3736    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    4241startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4342
    44 EXTRA_PROGRAMS += startup_g.rel
    45 CLEANFILES += startup_g.rel
    46 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    47 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    48 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    49 
    50 noinst_DATA += startup$(LIB_VARIANT).rel
    51 
    52 EXTRA_PROGRAMS += clock.rel
    53 CLEANFILES += clock.rel
     43noinst_PROGRAMS += clock.rel
    5444clock_rel_SOURCES = clock/ckinit.c
    5545clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5646clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5747
    58 EXTRA_PROGRAMS += clock_g.rel
    59 CLEANFILES += clock_g.rel
    60 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    61 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    62 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    63 
    64 noinst_DATA += clock$(LIB_VARIANT).rel
    65 
    66 EXTRA_PROGRAMS += console.rel
    67 CLEANFILES += console.rel
     48noinst_PROGRAMS += console.rel
    6849console_rel_SOURCES = console/console.c console/console-recording.h
    6950console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7051console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7152
    72 EXTRA_PROGRAMS += console_g.rel
    73 CLEANFILES += console_g.rel
    74 console_g_rel_SOURCES = $(console_rel_SOURCES)
    75 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    76 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    77 
    78 noinst_DATA += console$(LIB_VARIANT).rel
    79 
    80 EXTRA_PROGRAMS += fatal.rel
    81 CLEANFILES += fatal.rel
     53noinst_PROGRAMS += fatal.rel
    8254fatal_rel_SOURCES = fatal/bspfatal.c
    8355fatal_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8456fatal_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8557
    86 EXTRA_PROGRAMS += fatal_g.rel
    87 CLEANFILES += fatal_g.rel
    88 fatal_g_rel_SOURCES = $(fatal_rel_SOURCES)
    89 fatal_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    90 fatal_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    91 
    92 noinst_DATA += fatal$(LIB_VARIANT).rel
    93 
    94 EXTRA_PROGRAMS += timer.rel
    95 CLEANFILES += timer.rel
     58noinst_PROGRAMS += timer.rel
    9659timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    9760timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9861timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9962
    100 EXTRA_PROGRAMS += timer_g.rel
    101 CLEANFILES += timer_g.rel
    102 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    103 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    104 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    105 
    106 noinst_DATA += timer$(LIB_VARIANT).rel
    107 
    10863if HAS_NETWORKING
    10964network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    110 EXTRA_PROGRAMS += network.rel
    111 CLEANFILES += network.rel
     65noinst_PROGRAMS += network.rel
    11266network_rel_SOURCES = network/network.c
    11367network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    11468    $(network_CPPFLAGS)
    11569network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    116 
    117 EXTRA_PROGRAMS += network_g.rel
    118 CLEANFILES += network_g.rel
    119 network_g_rel_SOURCES = $(network_rel_SOURCES)
    120 network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    121     $(network_CPPFLAGS)
    122 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    123 
    124 noinst_DATA += network$(LIB_VARIANT).rel
    12570endif
    12671
    127 EXTRA_LIBRARIES = libbsp.a
    128 CLEANFILES += libbsp.a
     72noinst_LIBRARIES = libbsp.a
    12973libbsp_a_SOURCES =
    130 libbsp_a_LIBADD = clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
    131     fatal$(LIB_VARIANT).rel startup$(LIB_VARIANT).rel \
    132     timer$(LIB_VARIANT).rel
     74libbsp_a_LIBADD = clock.rel console.rel fatal.rel startup.rel timer.rel
    13375if HAS_NETWORKING
    134 libbsp_a_LIBADD += network$(LIB_VARIANT).rel
     76libbsp_a_LIBADD += network.rel
    13577endif
    136 libbsp_a_LIBADD += \
    137     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    138     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \
    139     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel
    140 
    141 EXTRA_LIBRARIES += libbsp_g.a
    142 CLEANFILES += libbsp_g.a
    143 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    144 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    145 
    146 noinst_DATA += libbsp$(LIB_VARIANT).a
     78libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     79    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \
     80    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel
    14781
    14882all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    196130PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
    197131
    198 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    199         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    200 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     132$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     133        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     134TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    201135
    202136$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    204138PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    205139
    206 CLEANFILES += $(PREINSTALL_FILES)
    207 DISTCLEANFILES = $(PREINSTALL_DIRS)
     140CLEANFILES = $(PREINSTALL_FILES)
     141DISTCLEANFILES += $(PREINSTALL_DIRS)
    208142CLEANFILES += $(TMPINSTALL_FILES)
    209143
  • c/src/lib/libbsp/m68k/ods68302/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152005-01-01      Ralf Corsepius <ralf_corsepius@rtems.org>
    26
  • c/src/lib/libbsp/m68k/ods68302/Makefile.am

    r7722eff7 r4cbf22a  
    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 =
     19
    1920EXTRA_DIST =
    2021
     
    2829if ODS68302_DEBUG
    2930EXTRA_DIST += start/debugreset.S
    30 start$(LIB_VARIANT).$(OBJEXT): start/debugreset.S
     31start.$(OBJEXT): start/debugreset.S
    3132        $(CPPASCOMPILE) -DASM -o $@ -c $<
    3233else
    3334EXTRA_DIST += start/reset.S
    34 start$(LIB_VARIANT).$(OBJEXT): start/reset.S
     35start.$(OBJEXT): start/reset.S
    3536        $(CPPASCOMPILE) -DASM -o $@ -c $<
    3637endif
    3738
    38 project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
     39project_lib_DATA = start.$(OBJEXT)
    3940
    4041dist_project_lib_DATA += startup/linkcmds startup/rom startup/debugger
    4142
    42 EXTRA_PROGRAMS += startup.rel
    43 CLEANFILES += startup.rel
     43noinst_PROGRAMS += startup.rel
    4444startup_rel_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.c \
    4545    startup/gdb-hooks.c ../../shared/bootcard.c ../../shared/main.c \
     
    5252startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5353
    54 EXTRA_PROGRAMS += startup_g.rel
    55 CLEANFILES += startup_g.rel
    56 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    57 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    58 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    59 
    60 noinst_DATA += startup$(LIB_VARIANT).rel
    61 
    62 EXTRA_PROGRAMS += clock.rel
    63 CLEANFILES += clock.rel
     54noinst_PROGRAMS += clock.rel
    6455clock_rel_SOURCES = clock/ckinit.c
    6556clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6657clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6758
    68 EXTRA_PROGRAMS += clock_g.rel
    69 CLEANFILES += clock_g.rel
    70 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    71 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    72 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    73 
    74 noinst_DATA += clock$(LIB_VARIANT).rel
    75 
    76 EXTRA_PROGRAMS += console.rel
    77 CLEANFILES += console.rel
     59noinst_PROGRAMS += console.rel
    7860console_rel_SOURCES = console/console.c
    7961console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8062console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8163
    82 EXTRA_PROGRAMS += console_g.rel
    83 CLEANFILES += console_g.rel
    84 console_g_rel_SOURCES = $(console_rel_SOURCES)
    85 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    86 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    87 
    88 noinst_DATA += console$(LIB_VARIANT).rel
    89 
    90 EXTRA_PROGRAMS += timer.rel
    91 CLEANFILES += timer.rel
     64noinst_PROGRAMS += timer.rel
    9265timer_rel_SOURCES = timer/timer.c timer/timerisr.S
    9366timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9467timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9568
    96 EXTRA_PROGRAMS += timer_g.rel
    97 CLEANFILES += timer_g.rel
    98 timer_g_rel_SOURCES = $(timer_rel_SOURCES)
    99 timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    100 timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    101 
    102 noinst_DATA += timer$(LIB_VARIANT).rel
    103 
    104 EXTRA_LIBRARIES = libbsp.a
    105 CLEANFILES += libbsp.a
     69noinst_LIBRARIES = libbsp.a
    10670libbsp_a_SOURCES =
    107 libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
    108     console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
    109 libbsp_a_LIBADD += \
    110     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    111     ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
    112 
    113 EXTRA_LIBRARIES += libbsp_g.a
    114 CLEANFILES += libbsp_g.a
    115 libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
    116 libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
    117 
    118 noinst_DATA += libbsp$(LIB_VARIANT).a
     71libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
     72libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     73    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    11974
    12075all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    170125PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    171126
    172 $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    173         $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
    174 TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
     127$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     128        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     129TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    175130
    176131$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    186141PREINSTALL_FILES += $(PROJECT_LIB)/debugger
    187142
    188 CLEANFILES += $(PREINSTALL_FILES)
    189 DISTCLEANFILES = $(PREINSTALL_DIRS)
     143CLEANFILES = $(PREINSTALL_FILES)
     144DISTCLEANFILES += $(PREINSTALL_DIRS)
    190145CLEANFILES += $(TMPINSTALL_FILES)
    191146
  • c/src/lib/libbsp/m68k/sim68000/ChangeLog

    r7722eff7 r4cbf22a  
     12005-01-02      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Remove build-variant support.
     4
    152004-11-25      Joel Sherrill <joel@OARcorp.com>
    26
  • c/src/lib/libbsp/m68k/sim68000/Makefile.am

    r7722eff7 r4cbf22a  
    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
    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
    30 EXTRA_PROGRAMS += startup.rel
    31 CLEANFILES += startup.rel
     30noinst_PROGRAMS += startup.rel
    3231startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
    3332    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     
    3938startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4039
    41 EXTRA_PROGRAMS += startup_g.rel
    42 CLEANFILES += startup_g.rel
    43 startup_g_rel_SOURCES = $(startup_rel_SOURCES)
    44 startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    45 startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    46 
    47 noinst_DATA += startup$(LIB_VARIANT).rel
    48 
    49 EXTRA_PROGRAMS += clock.rel
    50 CLEANFILES += clock.rel
     40noinst_PROGRAMS += clock.rel
    5141clock_rel_SOURCES = clock/clockdrv.c
    5242clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5343clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5444
    55 EXTRA_PROGRAMS += clock_g.rel
    56 CLEANFILES += clock_g.rel
    57 clock_g_rel_SOURCES = $(clock_rel_SOURCES)
    58 clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    59 clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    60 
    61 noinst_DATA += clock$(LIB_VARIANT).rel
    62 
    63 EXTRA_PROGRAMS += console.rel
    64 CLEANFILES += console.rel
     45noinst_PROGRAMS += console.rel
    6546console_rel_SOURCES = console/conscfg.c ../../shared/console.c
    66 
    6747console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    6848console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6949
    70 EXTRA_PROGRAMS += console_g.rel
    71 CLEANFILES += console_g.rel
    72 console_g_rel_SOURCES = $(console_rel_SOURCES)
    73 console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    74 console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    75 
    76 noinst_DATA += console$(LIB_VARIANT).rel
    77 
    78 EXTRA_PROGRAMS += timer.rel
    79 CLEANFILES += timer.rel
     50noinst_PROGRAMS += timer.rel
    8051timer_rel_SOURCES = ../../shared/timerstub.c
    8152timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8253timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8354
    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
     55noinst_LIBRARIES = libbsp.a
    9456libbsp_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 += \
    98     ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
    99     ../../../libcpu/@RTEMS_CPU@/shared/misc$(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
     57libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
     58libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     59    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
    10760
    10861all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     
    14295PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    14396
    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)
     97$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     98        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     99TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
    147100
    148101$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
     
    150103PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    151104
    152 CLEANFILES += $(PREINSTALL_FILES)
    153 DISTCLEANFILES = $(PREINSTALL_DIRS)
     105CLEANFILES = $(PREINSTALL_FILES)
     106DISTCLEANFILES += $(PREINSTALL_DIRS)
    154107CLEANFILES += $(TMPINSTALL_FILES)
    155108
Note: See TracChangeset for help on using the changeset viewer.