Changeset 552fca7 in rtems


Ignore:
Timestamp:
Jan 2, 2005, 12:40:17 AM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
44213ad
Parents:
509dc304
Message:

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

  • libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am support/Makefile.am, wrapup/Makefile.am: Remove build-variant support.
Location:
c/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    r509dc304 r552fca7  
     12005-01-01      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am
     4        support/Makefile.am, wrapup/Makefile.am:
     5        Remove build-variant support.
     6
    172004-11-22      Joel Sherrill <joel@OARcorp.com>
    28
  • c/src/libchip/Makefile.am

    r509dc304 r552fca7  
    55include $(top_srcdir)/automake/compile.am
    66
    7 noinst_DATA =
    8 
    97if LIBCHIP
    108include_libchipdir = $(includedir)/libchip
     
    1311
    1412EXTRA_DIST =
    15 EXTRA_LIBRARIES =
    16 EXTRA_PROGRAMS =
    17 CLEANFILES =
     13noinst_LIBRARIES =
     14noinst_PROGRAMS =
    1815
    1916# ide
     
    2219    ide/ide_ctrl_io.h
    2320
    24 EXTRA_LIBRARIES += libide.a
    25 CLEANFILES += libide.a
     21noinst_LIBRARIES += libide.a
    2622libide_a_SOURCES = ide/ata.c ide/ide_controller.c ide/ata_internal.h
    2723libide_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    28 
    29 EXTRA_LIBRARIES += libide_g.a
    30 CLEANFILES += libide_g.a
    31 libide_g_a_SOURCES = $(libide_a_SOURCES)
    32 libide_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    33 
    34 noinst_DATA += libide$(LIB_VARIANT).a
    3524endif
    3625
     
    4332
    4433libnetchip_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    45 EXTRA_LIBRARIES += libnetchip.a
    46 CLEANFILES += libnetchip.a
     34noinst_LIBRARIES += libnetchip.a
    4735libnetchip_a_SOURCES = network/cs8900.c network/dec21140.c network/i82586.c \
    4836    network/sonic.c network/if_fxp.c network/elnk.c network/open_eth.c
    4937libnetchip_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
    5038    $(libnetchip_CPPFLAGS)
    51 
    52 EXTRA_LIBRARIES += libnetchip_g.a
    53 CLEANFILES += libnetchip_g.a
    54 libnetchip_g_a_SOURCES = $(libnetchip_a_SOURCES)
    55 libnetchip_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
    56     $(libnetchip_CPPFLAGS)
    57 
    58 # FIXME: Why is this lib installed?
    59 project_lib_DATA = libnetchip$(LIB_VARIANT).a
    6039endif
    6140endif
     
    7049    rtc/mc146818a.h
    7150
    72 EXTRA_LIBRARIES += librtcio.a
    73 CLEANFILES += librtcio.a
     51noinst_LIBRARIES += librtcio.a
    7452librtcio_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7553librtcio_a_SOURCES = rtc/rtcprobe.c rtc/icm7170.c rtc/icm7170_reg.c \
     
    7755    rtc/m48t08_reg.c rtc/m48t08_reg2.c rtc/m48t08_reg4.c rtc/m48t08_reg8.c \
    7856    rtc/mc146818a.c rtc/mc146818a_ioreg.c
    79 
    80 EXTRA_LIBRARIES += librtcio_g.a
    81 CLEANFILES += librtcio_g.a
    82 librtcio_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    83 librtcio_g_a_SOURCES = $(librtcio_a_SOURCES)
    84 
    85 noinst_DATA += librtcio$(LIB_VARIANT).a
    8657endif
    8758
     
    9465    serial/serial.h serial/sersupp.h
    9566
    96 EXTRA_LIBRARIES += libserialio.a
    97 CLEANFILES += libserialio.a
     67noinst_LIBRARIES += libserialio.a
    9868libserialio_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    9969libserialio_a_SOURCES = serial/mc68681.c serial/mc68681_baud.c \
     
    10373    serial/termios_baud2num.c serial/mc68681_p.h serial/ns16550_p.h \
    10474    serial/z85c30_p.h
    105 
    106 EXTRA_LIBRARIES += libserialio_g.a
    107 CLEANFILES += libserialio_g.a
    108 libserialio_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    109 libserialio_g_a_SOURCES = $(libserialio_a_SOURCES)
    110 
    111 noinst_DATA += libserialio$(LIB_VARIANT).a
    11275endif
    11376
     
    11982include_HEADERS = shmdr/shm_driver.h shmdr/mpci.h
    12083
    121 EXTRA_PROGRAMS += shmdr.rel
    122 CLEANFILES += shmdr.rel
     84project_lib_PROGRAMS = shmdr.rel
    12385shmdr_rel_SOURCES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \
    12486    shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \
     
    12789shmdr_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    12890shmdr_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    129 
    130 EXTRA_PROGRAMS += shmdr_g.rel
    131 CLEANFILES += shmdr_g.rel
    132 shmdr_g_rel_SOURCES = $(no_shmdr_rel_SOURCES)
    133 shmdr_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    134 shmdr_g_rel_LDFLAGS = $(RTEMS_REL_LDFLAGS)
    135 
    136 project_lib_DATA = shmdr$(LIB_VARIANT).rel
    13791endif
    13892
     
    152106PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
    153107
    154 $(PROJECT_LIB)/$(dirstamp):
    155         @$(mkdir_p) $(PROJECT_LIB)
    156         @: > $(PROJECT_LIB)/$(dirstamp)
    157 TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
    158 
    159108if LIBCHIP
    160109$(PROJECT_INCLUDE)/libchip/$(dirstamp):
     
    211160        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h
    212161PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h
    213 
    214 $(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a: libnetchip$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
    215         $(INSTALL_DATA) $< $(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a
    216 TMPINSTALL_FILES += $(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a
    217162endif
    218163endif
     
    267212PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpci.h
    268213
    269 $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel: shmdr$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    270         $(INSTALL_DATA) $< $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel
    271 TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel
    272 endif
    273 
    274 CLEANFILES += $(PREINSTALL_FILES)
     214$(PROJECT_LIB)/shmdr.rel: shmdr.rel $(PROJECT_LIB)/$(dirstamp)
     215        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/shmdr.rel
     216TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr.rel
     217endif
     218
     219CLEANFILES = $(PREINSTALL_FILES)
    275220DISTCLEANFILES = $(PREINSTALL_DIRS)
    276221CLEANFILES += $(TMPINSTALL_FILES)
  • c/src/librdbg/Makefile.am

    r509dc304 r552fca7  
    1717include_rdbg_HEADERS = include/rdbg/rdbg.h include/rdbg/servrpc.h
    1818
    19 EXTRA_LIBRARIES = librdbg.a
    20 CLEANFILES += librdbg.a
     19noinst_LIBRARIES = librdbg.a
    2120librdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    22 
    23 EXTRA_LIBRARIES += librdbg_g.a
    24 CLEANFILES += librdbg_g.a
    25 librdbg_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    26 librdbg_g_a_SOURCES = $(librdbg_a_SOURCES)
    27 
    28 project_lib_DATA = librdbg$(LIB_VARIANT).a
    29 
    3021librdbg_a_SOURCES = src/rdbg.c src/servcon.c src/servbkpt.c src/servrpc.c \
    3122    src/excep.c src/servtgt.c src/servtsp.c src/servutil.c src/_servtgt.c \
     
    183174PREINSTALL_DIRS =
    184175PREINSTALL_FILES =
    185 TMPINSTALL_FILES =
    186 
    187 $(PROJECT_LIB)/$(dirstamp):
    188         @$(mkdir_p) $(PROJECT_LIB)
    189         @: > $(PROJECT_LIB)/$(dirstamp)
    190 TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
    191176
    192177if HAS_RDBG
     
    203188        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/servrpc.h
    204189PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/servrpc.h
    205 
    206 $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a: librdbg$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
    207         $(INSTALL_DATA) $< $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
    208 TMPINSTALL_FILES += $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
    209190endif
    210191
     
    259240CLEANFILES += $(PREINSTALL_FILES)
    260241DISTCLEANFILES = $(PREINSTALL_DIRS)
    261 CLEANFILES += $(TMPINSTALL_FILES)
    262242
    263243include $(top_srcdir)/automake/local.am
  • c/src/optman/Makefile.am

    r509dc304 r552fca7  
    77EXEEXT =
    88
    9 EXTRA_PROGRAMS =
    10 CLEANFILES =
    11 project_lib_DATA =
     9project_lib_PROGRAMS =
    1210
    13 EXTRA_PROGRAMS += no-ext.rel
    14 CLEANFILES += no-ext.rel
     11project_lib_PROGRAMS += no-ext.rel
    1512no_ext_rel_SOURCES = sapi/no-ext.c
    1613no_ext_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    1714no_ext_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    1815
    19 EXTRA_PROGRAMS += no-ext_g.rel
    20 CLEANFILES += no-ext_g.rel
    21 no_ext_g_rel_SOURCES = $(no_ext_rel_SOURCES)
    22 no_ext_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    23 no_ext_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    24 
    25 project_lib_DATA += no-ext$(LIB_VARIANT).rel
    26 
    27 EXTRA_PROGRAMS += no-io.rel
    28 CLEANFILES += no-io.rel
     16project_lib_PROGRAMS += no-io.rel
    2917no_io_rel_SOURCES = sapi/no-io.c
    3018no_io_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    3119no_io_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    3220
    33 EXTRA_PROGRAMS += no-io_g.rel
    34 CLEANFILES += no-io_g.rel
    35 no_io_g_rel_SOURCES = $(no_io_rel_SOURCES)
    36 no_io_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    37 no_io_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    38 
    39 project_lib_DATA += no-io$(LIB_VARIANT).rel
    40 
    41 EXTRA_PROGRAMS += no-dpmem.rel
    42 CLEANFILES += no-dpmem.rel
     21project_lib_PROGRAMS += no-dpmem.rel
    4322no_dpmem_rel_SOURCES = rtems/no-dpmem.c
    4423no_dpmem_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    4524no_dpmem_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4625
    47 EXTRA_PROGRAMS += no-dpmem_g.rel
    48 CLEANFILES += no-dpmem_g.rel
    49 no_dpmem_g_rel_SOURCES = $(no_dpmem_rel_SOURCES)
    50 no_dpmem_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    51 no_dpmem_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    52 
    53 project_lib_DATA += no-dpmem$(LIB_VARIANT).rel
    54 
    55 EXTRA_PROGRAMS += no-event.rel
    56 CLEANFILES += no-event.rel
     26project_lib_PROGRAMS += no-event.rel
    5727no_event_rel_SOURCES = rtems/no-event.c
    5828no_event_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5929no_event_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6030
    61 EXTRA_PROGRAMS += no-event_g.rel
    62 CLEANFILES += no-event_g.rel
    63 no_event_g_rel_SOURCES = $(no_event_rel_SOURCES)
    64 no_event_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    65 no_event_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    66 
    67 project_lib_DATA += no-event$(LIB_VARIANT).rel
    68 
    69 EXTRA_PROGRAMS += no-msg.rel
    70 CLEANFILES += no-msg.rel
     31project_lib_PROGRAMS += no-msg.rel
    7132no_msg_rel_SOURCES = rtems/no-msg.c
    7233no_msg_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7334no_msg_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7435
    75 EXTRA_PROGRAMS += no-msg_g.rel
    76 CLEANFILES += no-msg_g.rel
    77 no_msg_g_rel_SOURCES = $(no_msg_rel_SOURCES)
    78 no_msg_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    79 no_msg_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    80 
    81 project_lib_DATA += no-msg$(LIB_VARIANT).rel
    82 
    83 EXTRA_PROGRAMS += no-mp.rel
    84 CLEANFILES += no-mp.rel
     36project_lib_PROGRAMS += no-mp.rel
    8537no_mp_rel_SOURCES = rtems/no-mp.c
    8638no_mp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    8739no_mp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    8840
    89 EXTRA_PROGRAMS += no-mp_g.rel
    90 CLEANFILES += no-mp_g.rel
    91 no_mp_g_rel_SOURCES = $(no_mp_rel_SOURCES)
    92 no_mp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    93 no_mp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    94 
    95 project_lib_DATA += no-mp$(LIB_VARIANT).rel
    96 
    97 EXTRA_PROGRAMS += no-part.rel
    98 CLEANFILES += no-part.rel
     41project_lib_PROGRAMS += no-part.rel
    9942no_part_rel_SOURCES = rtems/no-part.c
    10043no_part_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    10144no_part_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    10245
    103 EXTRA_PROGRAMS += no-part_g.rel
    104 CLEANFILES += no-part_g.rel
    105 no_part_g_rel_SOURCES = $(no_part_rel_SOURCES)
    106 no_part_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    107 no_part_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    108 
    109 project_lib_DATA += no-part$(LIB_VARIANT).rel
    110 
    111 EXTRA_PROGRAMS += no-region.rel
    112 CLEANFILES += no-region.rel
     46project_lib_PROGRAMS += no-region.rel
    11347no_region_rel_SOURCES = rtems/no-region.c
    11448no_region_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    11549no_region_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    11650
    117 EXTRA_PROGRAMS += no-region_g.rel
    118 CLEANFILES += no-region_g.rel
    119 no_region_g_rel_SOURCES = $(no_region_rel_SOURCES)
    120 no_region_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    121 no_region_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    122 
    123 project_lib_DATA += no-region$(LIB_VARIANT).rel
    124 
    125 EXTRA_PROGRAMS += no-rtmon.rel
    126 CLEANFILES += no-rtmon.rel
     51project_lib_PROGRAMS += no-rtmon.rel
    12752no_rtmon_rel_SOURCES = rtems/no-rtmon.c
    12853no_rtmon_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    12954no_rtmon_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    13055
    131 EXTRA_PROGRAMS += no-rtmon_g.rel
    132 CLEANFILES += no-rtmon_g.rel
    133 no_rtmon_g_rel_SOURCES = $(no_rtmon_rel_SOURCES)
    134 no_rtmon_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    135 no_rtmon_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    136 
    137 project_lib_DATA += no-rtmon$(LIB_VARIANT).rel
    138 
    139 EXTRA_PROGRAMS += no-sem.rel
    140 CLEANFILES += no-sem.rel
     56project_lib_PROGRAMS += no-sem.rel
    14157no_sem_rel_SOURCES = rtems/no-sem.c
    14258no_sem_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    14359no_sem_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    14460
    145 EXTRA_PROGRAMS += no-sem_g.rel
    146 CLEANFILES += no-sem_g.rel
    147 no_sem_g_rel_SOURCES = $(no_sem_rel_SOURCES)
    148 no_sem_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    149 no_sem_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    150 
    151 project_lib_DATA += no-sem$(LIB_VARIANT).rel
    152 
    153 EXTRA_PROGRAMS += no-signal.rel
    154 CLEANFILES += no-signal.rel
     61project_lib_PROGRAMS += no-signal.rel
    15562no_signal_rel_SOURCES = rtems/no-signal.c
    15663no_signal_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    15764no_signal_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    15865
    159 EXTRA_PROGRAMS += no-signal_g.rel
    160 CLEANFILES += no-signal_g.rel
    161 no_signal_g_rel_SOURCES = $(no_signal_rel_SOURCES)
    162 no_signal_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    163 no_signal_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    164 
    165 project_lib_DATA += no-signal$(LIB_VARIANT).rel
    166 
    167 EXTRA_PROGRAMS += no-timer.rel
    168 CLEANFILES += no-timer.rel
     66project_lib_PROGRAMS += no-timer.rel
    16967no_timer_rel_SOURCES = rtems/no-timer.c
    17068no_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    17169no_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    172 
    173 EXTRA_PROGRAMS += no-timer_g.rel
    174 CLEANFILES += no-timer_g.rel
    175 no_timer_g_rel_SOURCES = $(no_timer_rel_SOURCES)
    176 no_timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    177 no_timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    178 
    179 project_lib_DATA += no-timer$(LIB_VARIANT).rel
    18070
    18171all-local: $(TMPINSTALL_FILES)
     
    18373TMPINSTALL_FILES =
    18474
    185 $(PROJECT_LIB)/$(dirstamp):
    186         @$(mkdir_p) $(PROJECT_LIB)
    187         @: > $(PROJECT_LIB)/$(dirstamp)
    188 TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
     75$(PROJECT_LIB)/no-ext.rel: no-ext.rel $(PROJECT_LIB)/$(dirstamp)
     76        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-ext.rel
     77TMPINSTALL_FILES += $(PROJECT_LIB)/no-ext.rel
    18978
    190 $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel: no-ext$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    191         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel
    192 TMPINSTALL_FILES += $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel
     79$(PROJECT_LIB)/no-io.rel: no-io.rel $(PROJECT_LIB)/$(dirstamp)
     80        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-io.rel
     81TMPINSTALL_FILES += $(PROJECT_LIB)/no-io.rel
    19382
    194 $(PROJECT_LIB)/no-io$(LIB_VARIANT).rel: no-io$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    195         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-io$(LIB_VARIANT).rel
    196 TMPINSTALL_FILES += $(PROJECT_LIB)/no-io$(LIB_VARIANT).rel
     83$(PROJECT_LIB)/no-dpmem.rel: no-dpmem.rel $(PROJECT_LIB)/$(dirstamp)
     84        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-dpmem.rel
     85TMPINSTALL_FILES += $(PROJECT_LIB)/no-dpmem.rel
    19786
    198 $(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel: no-dpmem$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    199         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel
    200 TMPINSTALL_FILES += $(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel
     87$(PROJECT_LIB)/no-event.rel: no-event.rel $(PROJECT_LIB)/$(dirstamp)
     88        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-event.rel
     89TMPINSTALL_FILES += $(PROJECT_LIB)/no-event.rel
    20190
    202 $(PROJECT_LIB)/no-event$(LIB_VARIANT).rel: no-event$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    203         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-event$(LIB_VARIANT).rel
    204 TMPINSTALL_FILES += $(PROJECT_LIB)/no-event$(LIB_VARIANT).rel
     91$(PROJECT_LIB)/no-msg.rel: no-msg.rel $(PROJECT_LIB)/$(dirstamp)
     92        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-msg.rel
     93TMPINSTALL_FILES += $(PROJECT_LIB)/no-msg.rel
    20594
    206 $(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel: no-msg$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    207         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel
    208 TMPINSTALL_FILES += $(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel
     95$(PROJECT_LIB)/no-mp.rel: no-mp.rel $(PROJECT_LIB)/$(dirstamp)
     96        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-mp.rel
     97TMPINSTALL_FILES += $(PROJECT_LIB)/no-mp.rel
    20998
    210 $(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel: no-mp$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    211         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel
    212 TMPINSTALL_FILES += $(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel
     99$(PROJECT_LIB)/no-part.rel: no-part.rel $(PROJECT_LIB)/$(dirstamp)
     100        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-part.rel
     101TMPINSTALL_FILES += $(PROJECT_LIB)/no-part.rel
    213102
    214 $(PROJECT_LIB)/no-part$(LIB_VARIANT).rel: no-part$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    215         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-part$(LIB_VARIANT).rel
    216 TMPINSTALL_FILES += $(PROJECT_LIB)/no-part$(LIB_VARIANT).rel
     103$(PROJECT_LIB)/no-region.rel: no-region.rel $(PROJECT_LIB)/$(dirstamp)
     104        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-region.rel
     105TMPINSTALL_FILES += $(PROJECT_LIB)/no-region.rel
    217106
    218 $(PROJECT_LIB)/no-region$(LIB_VARIANT).rel: no-region$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    219         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-region$(LIB_VARIANT).rel
    220 TMPINSTALL_FILES += $(PROJECT_LIB)/no-region$(LIB_VARIANT).rel
     107$(PROJECT_LIB)/no-rtmon.rel: no-rtmon.rel $(PROJECT_LIB)/$(dirstamp)
     108        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-rtmon.rel
     109TMPINSTALL_FILES += $(PROJECT_LIB)/no-rtmon.rel
    221110
    222 $(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel: no-rtmon$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    223         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel
    224 TMPINSTALL_FILES += $(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel
     111$(PROJECT_LIB)/no-sem.rel: no-sem.rel $(PROJECT_LIB)/$(dirstamp)
     112        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-sem.rel
     113TMPINSTALL_FILES += $(PROJECT_LIB)/no-sem.rel
    225114
    226 $(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel: no-sem$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    227         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel
    228 TMPINSTALL_FILES += $(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel
     115$(PROJECT_LIB)/no-signal.rel: no-signal.rel $(PROJECT_LIB)/$(dirstamp)
     116        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-signal.rel
     117TMPINSTALL_FILES += $(PROJECT_LIB)/no-signal.rel
    229118
    230 $(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel: no-signal$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    231         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel
    232 TMPINSTALL_FILES += $(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel
     119$(PROJECT_LIB)/no-timer.rel: no-timer.rel $(PROJECT_LIB)/$(dirstamp)
     120        $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-timer.rel
     121TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer.rel
    233122
    234 $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel: no-timer$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    235         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel
    236 TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel
    237 
    238 CLEANFILES += $(TMPINSTALL_FILES)
     123CLEANFILES = $(TMPINSTALL_FILES)
    239124
    240125include $(top_srcdir)/automake/local.am
  • c/src/support/Makefile.am

    r509dc304 r552fca7  
    77AM_CPPFLAGS += -DRTEMS_BSP=\"@RTEMS_BSP@\"
    88
    9 EXTRA_LIBRARIES = libsupport.a
    10 CLEANFILES = libsupport.a
     9noinst_LIBRARIES = libsupport.a
     10
    1111libsupport_a_SOURCES = version.c
    1212libsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    1313
    14 EXTRA_LIBRARIES += libsupport_g.a
    15 CLEANFILES += libsupport_g.a
    16 libsupport_g_a_SOURCES = $(libsupport_a_SOURCES)
    17 libsupport_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    18 
    19 noinst_DATA = libsupport$(LIB_VARIANT).a
    20 
    2114include $(top_srcdir)/automake/local.am
  • c/src/wrapup/Makefile.am

    r509dc304 r552fca7  
    88
    99## Setup the variant build subdirectory
    10 ARCH_OPTIMIZE_V = o-optimize
    11 ARCH_DEBUG_V = o-debug
     10project_lib_DATA = o-optimize/librtemsbsp.a
     11CLEANFILES = o-optimize/librtemsbsp.a
    1212
    13 ARCH__V = $(ARCH_OPTIMIZE_V)
    14 ARCH = $(ARCH_$(VARIANT_V)_V)
    15 
    16 project_lib_DATA = $(ARCH)/librtemsbsp$(LIB_VARIANT).a
    17 CLEANFILES = o-optimize/librtemsbsp.a
    18 CLEANFILES += o-debug/librtemsbsp_g.a
    19 
    20 SRCS = ../support/libsupport$(LIB_VARIANT).a
     13SRCS = ../support/libsupport.a
    2114
    2215if HAS_LIBBSP
    2316if HAS_WRAPUP_LIBBSP
    2417SRCS += \
    25     ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
     18    ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/o-optimize/libbsp.a
    2619else
    27 SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp$(LIB_VARIANT).a
     20SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a
    2821endif
    2922endif
    3023
    3124if HAS_NETWORKING
    32 SRCS += ../libnetworking/pppd/libpppd$(LIB_VARIANT).a
    33 SRCS += ../libnetworking/rtems_servers/libftpd$(LIB_VARIANT).a
    34 SRCS += ../libnetworking/rtems_telnetd/libtelnetd$(LIB_VARIANT).a
     25SRCS += ../libnetworking/pppd/libpppd.a
     26SRCS += ../libnetworking/rtems_servers/libftpd.a
     27SRCS += ../libnetworking/rtems_telnetd/libtelnetd.a
    3528endif
    3629
    3730if HAS_RDBG
    38 SRCS += ../librdbg/librdbg$(LIB_VARIANT).a
     31SRCS += ../librdbg/librdbg.a
    3932endif
    4033
    4134# FIXME: ATM, there is no libcpu.a, anymore.
    42 # SRCS += $(wildcard $(PROJECT_LIB)/libcpu$(LIB_VARIANT).a)
     35# SRCS += $(wildcard $(PROJECT_LIB)/libcpu.a)
    4336
    4437if LIBCHIP
    45 SRCS += ../libchip/librtcio$(LIB_VARIANT).a
    46 SRCS += ../libchip/libserialio$(LIB_VARIANT).a
    47 SRCS += ../libchip/libide$(LIB_VARIANT).a
     38SRCS += ../libchip/librtcio.a
     39SRCS += ../libchip/libserialio.a
     40SRCS += ../libchip/libide.a
    4841if HAS_NETWORKING
    49 SRCS += ../libchip/libnetchip$(LIB_VARIANT).a
     42SRCS += ../libchip/libnetchip.a
    5043endif
    5144endif
    5245
    53 SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
     46SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor.$(OBJEXT))
    5447
    5548if HAS_MP
    56 SRCS += ../libchip/shmdr$(LIB_VARIANT).rel
     49SRCS += ../libchip/shmdr.rel
    5750endif
    5851
    5952all-local: $(TMPINSTALL_FILES)
    6053
    61 $(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS)
     54o-optimize/librtemsbsp.a: $(SRCS)
    6255        rm -f $@
    63         $(mkdir_p) $(ARCH)
    64         rm -rf $(ARCH)/*.a $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
     56        $(mkdir_p) o-optimize
     57        rm -rf o-optimize/*.a o-optimize/*.$(OBJEXT) o-optimize/*.rel
    6558        for f in $(SRCS); do \
    6659          case $$f in \
    6760          *.$(OBJEXT) | *.rel) \
    68             if test -f $(ARCH)/`basename $$f`; then \
    69               if cmp $$f $(ARCH)/`basename $$f`; then \
     61            if test -f o-optimize/`basename $$f`; then \
     62              if cmp $$f o-optimize/`basename $$f`; then \
    7063                true; \
    7164              else \
     
    7467              fi; \
    7568            else \
    76               cp $$f $(ARCH)/; \
    77               chmod a-w $(ARCH)/`basename $$f`; \
     69              cp $$f o-optimize/; \
     70              chmod a-w o-optimize/`basename $$f`; \
    7871            fi; \
    7972            ;; \
    8073          *.a) \
    81             cd $(ARCH); \
     74            cd o-optimize; \
    8275              $(AR) xv ../$$f || exit 1; \
    8376              chmod a-w * ; \
     
    8679          esac; \
    8780        done
    88         $(AR) rc $@ $(ARCH)/*
    89         rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
     81        $(AR) rc $@ o-optimize/*
     82        rm -f o-optimize/*.$(OBJEXT) o-optimize/*.rel
    9083        $(RANLIB) $@
    9184
     
    9790TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
    9891
    99 $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
    100         $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
    101 TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
     92$(PROJECT_LIB)/librtemsbsp.a: o-optimize/librtemsbsp.a $(PROJECT_LIB)/$(dirstamp)
     93        $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp.a
     94TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp.a
    10295
    10396CLEANFILES += $(TMPINSTALL_FILES)
Note: See TracChangeset for help on using the changeset viewer.