Changeset 846a4af in rtems


Ignore:
Timestamp:
Jan 1, 2005, 10:41:29 AM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
b815d9e
Parents:
f346774d
Message:

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

  • automake/compile.am, httpd/Makefile.am, itron/Makefile.am, libblock/Makefile.am, libcsupport/Makefile.am, libfs/Makefile.am, libmisc/Makefile.am, libnetworking/Makefile.am, librpc/Makefile.am, posix/Makefile.am, rtems/Makefile.am, sapi/Makefile.am, score/Makefile.am, wrapup/Makefile.am: Remove build-variant support.
Location:
cpukit
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rf346774d r846a4af  
     12005-01-01      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * automake/compile.am, httpd/Makefile.am, itron/Makefile.am,
     4        libblock/Makefile.am, libcsupport/Makefile.am, libfs/Makefile.am,
     5        libmisc/Makefile.am, libnetworking/Makefile.am, librpc/Makefile.am,
     6        posix/Makefile.am, rtems/Makefile.am, sapi/Makefile.am,
     7        score/Makefile.am, wrapup/Makefile.am:
     8        Remove build-variant support.
     9
    1102004-12-30      Ralf Corsepius <ralf.corsepius@rtems.org>
    211
  • cpukit/automake/compile.am

    rf346774d r846a4af  
    3939## -------------------------------------------------------------------------
    4040
    41 ## translate VARIANT into VARIANT_V
    42 VARIANT = OPTIMIZE
    43 
    44 VARIANT_OPTIMIZE_V = OPTIMIZE
    45 VARIANT_DEBUG_V = DEBUG
    46 VARIANT_optimize_V = OPTIMIZE
    47 VARIANT_debug_V = DEBUG
    48 
    49 VARIANT_V = $(VARIANT_$(VARIANT)_V)
    50 
    51 ## Setup the library suffix
    52 LIBSUFFIX_OPTIMIZE_V =
    53 LIBSUFFIX_DEBUG_V = _g
    54 LIBSUFFIX__V = $(LIBSUFFIX_OPTIMIZE_V)
    55 
    56 LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V)
    57 
    5841## These are supposed to be set in make/custom/<bsp>.cfg
    5942CPU_CFLAGS = @CPU_CFLAGS@
    6043CFLAGS_OPTIMIZE_V = @CFLAGS_OPTIMIZE_V@
    61 CFLAGS_DEBUG_V = @CFLAGS_DEBUG_V@
    62 CFLAGS__V = $(CFLAGS_OPTIMIZE_V)
    6344
    6445## -------------------------------------------------------------------------
  • cpukit/httpd/Makefile.am

    rf346774d r846a4af  
    55include $(top_srcdir)/automake/compile.am
    66
    7 EXTRA_LIBRARIES =
     7noinst_LIBRARIES =
    88CLEANFILES =
    99
     
    1818    wsIntrn.h
    1919
    20 EXTRA_LIBRARIES += libhttpd.a
    21 CLEANFILES += libhttpd.a
     20project_lib_LIBRARIES = libhttpd.a
    2221libhttpd_a_SOURCES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c \
    2322    form.c h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c \
     
    2524    webrom.c webs.c websuemf.c webmain.c
    2625libhttpd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    27 
    28 EXTRA_LIBRARIES += libhttpd_g.a
    29 CLEANFILES += libhttpd_g.a
    30 libhttpd_g_a_SOURCES = $(libhttpd_a_SOURCES)
    31 libhttpd_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    32 
    33 project_lib_DATA = libhttpd$(LIB_VARIANT).a
    3426endif
    3527endif
     
    9688PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/wsIntrn.h
    9789
    98 $(PROJECT_LIB)/libhttpd$(LIB_VARIANT).a: libhttpd$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
    99         $(INSTALL_DATA) $< $(PROJECT_LIB)/libhttpd$(LIB_VARIANT).a
    100 TMPINSTALL_FILES += $(PROJECT_LIB)/libhttpd$(LIB_VARIANT).a
     90$(PROJECT_LIB)/libhttpd.a: libhttpd.a $(PROJECT_LIB)/$(dirstamp)
     91        $(INSTALL_DATA) $< $(PROJECT_LIB)/libhttpd.a
     92TMPINSTALL_FILES += $(PROJECT_LIB)/libhttpd.a
    10193endif
    10294endif
  • cpukit/itron/Makefile.am

    rf346774d r846a4af  
    107107AM_CPPFLAGS += -D__RTEMS_INSIDE__
    108108
    109 EXTRA_LIBRARIES = libitron.a
    110 CLEANFILES += libitron.a
     109noinst_LIBRARIES = libitron.a
    111110libitron_a_SOURCES = $(C_FILES)
    112111libitron_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    113112
    114 EXTRA_LIBRARIES += libitron_g.a
    115 CLEANFILES += libitron_g.a
    116 libitron_g_a_SOURCES = $(libitron_a_SOURCES)
    117 libitron_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    118 
    119 all-local: $(PREINSTALL_FILES) libitron$(LIB_VARIANT).a
     113all-local: $(PREINSTALL_FILES)
    120114endif
    121115
  • cpukit/libblock/Makefile.am

    rf346774d r846a4af  
    1313include_rtemsdir = $(includedir)/rtems
    1414
    15 EXTRA_LIBRARIES = libblock.a
    16 CLEANFILES += libblock.a
     15noinst_LIBRARIES = libblock.a
    1716libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    18 
    19 EXTRA_LIBRARIES += libblock_g.a
    20 CLEANFILES += libblock_g.a
    21 libblock_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    2217
    2318include_rtems_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \
     
    2823    src/ide_part_table.c
    2924
    30 libblock_g_a_SOURCES = $(libblock_a_SOURCES)
    31 
    32 all-local: $(PREINSTALL_FILES) libblock$(LIB_VARIANT).a
     25all-local: $(PREINSTALL_FILES)
    3326endif
    3427
  • cpukit/libcsupport/Makefile.am

    rf346774d r846a4af  
    88AM_CPPFLAGS += -I$(top_builddir)
    99
    10 EXTRA_LIBRARIES = libcsupport.a
    11 CLEANFILES = libcsupport.a
     10noinst_LIBRARIES = libcsupport.a
    1211libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    13 
    14 EXTRA_LIBRARIES += libcsupport_g.a
    15 CLEANFILES += libcsupport_g.a
    16 libcsupport_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    1712
    1813include_rtemsdir = $(includedir)/rtems
     
    6459
    6560##  General stuff
    66 all-local: $(PREINSTALL_FILES) libcsupport$(LIB_VARIANT).a
     61all-local: $(PREINSTALL_FILES)
    6762
    6863ERROR_C_FILES = src/error.c
     
    122117endif
    123118
    124 libcsupport_g_a_SOURCES = $(libcsupport_a_SOURCES)
    125 
    126119EXTRA_DIST = src/TODO src/CASES src/README
    127120
     
    316309PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8536.h
    317310
    318 CLEANFILES += $(PREINSTALL_FILES)
     311CLEANFILES = $(PREINSTALL_FILES)
    319312DISTCLEANFILES += $(PREINSTALL_DIRS)
    320313
  • cpukit/libfs/Makefile.am

    rf346774d r846a4af  
    1313include_rtems_HEADERS =
    1414
    15 EXTRA_LIBRARIES = libimfs.a
    16 CLEANFILES = libimfs.a
     15noinst_LIBRARIES = libimfs.a
    1716libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    18 
    19 EXTRA_LIBRARIES += libimfs_g.a
    20 CLEANFILES += libimfs_g.a
    21 libimfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    2217
    2318UNUSED_FILES = src/imfs/imfs_load_tar.c
     
    4338endif
    4439
    45 libimfs_g_a_SOURCES = $(libimfs_a_SOURCES)
    46 
    4740include_rtems_HEADERS += src/imfs/imfs.h
    48 
    49 IMFSLIB = libimfs$(LIB_VARIANT).a
    5041
    5142# dosfs
    5243
    5344if !UNIX
    54 EXTRA_LIBRARIES += libdosfs.a
    55 CLEANFILES += libdosfs.a
     45noinst_LIBRARIES += libdosfs.a
    5646libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    57 
    58 EXTRA_LIBRARIES += libdosfs_g.a
    59 CLEANFILES += libdosfs_g.a
    60 libdosfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    6147
    6248# libdosfs_FATFS_C_FILES
     
    7460    src/dosfs/msdos_conv.c src/dosfs/msdos.h src/dosfs/msdos_format.c
    7561
    76 libdosfs_g_a_SOURCES = $(libdosfs_a_SOURCES)
    77 
    7862include_rtems_HEADERS += src/dosfs/dosfs.h
    79 
    80 DOSFSLIB = libdosfs$(LIB_VARIANT).a
    8163endif
    8264
    8365EXTRA_DIST += $(UNUSED_FILES)
    8466
    85 all-local: $(PREINSTALL_FILES) $(IMFSLIB) $(DOSFSLIB)
     67all-local: $(PREINSTALL_FILES)
    8668
    8769# ---
     
    10587endif
    10688
    107 CLEANFILES += $(PREINSTALL_FILES)
     89CLEANFILES = $(PREINSTALL_FILES)
    10890DISTCLEANFILES = $(PREINSTALL_DIRS)
    10991
  • cpukit/libmisc/Makefile.am

    rf346774d r846a4af  
    1111include_rtemsdir = $(includedir)/rtems
    1212include_rtems_HEADERS =
    13 EXTRA_LIBRARIES =
    14 TMP_LIBS =
     13noinst_LIBRARIES =
    1514CLEANFILES =
    1615
     
    1918include_rtems_HEADERS += capture/capture.h capture/capture-cli.h
    2019
    21 EXTRA_LIBRARIES += libcapture.a
    22 CLEANFILES += libcapture.a
     20noinst_LIBRARIES += libcapture.a
    2321libcapture_a_SOURCES = capture/capture.c capture/capture-cli.c
    2422libcapture_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    25 
    26 EXTRA_LIBRARIES += libcapture_g.a
    27 CLEANFILES += libcapture_g.a
    28 libcapture_g_a_SOURCES = $(libcapture_a_SOURCES)
    29 libcapture_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    30 
    31 TMP_LIBS += libcapture$(LIB_VARIANT).a
    3223
    3324## cpuuse
     
    3526include_rtems_HEADERS += cpuuse/cpuuse.h
    3627
    37 EXTRA_LIBRARIES += libcpuuse.a
    38 CLEANFILES += libcpuuse.a
     28noinst_LIBRARIES += libcpuuse.a
    3929libcpuuse_a_SOURCES = cpuuse/cpuuse.c
    4030libcpuuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    4131
    42 EXTRA_LIBRARIES += libcpuuse_g.a
    43 CLEANFILES += libcpuuse_g.a
    44 libcpuuse_g_a_SOURCES = $(libcpuuse_a_SOURCES)
    45 libcpuuse_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    46 
    47 TMP_LIBS += libcpuuse$(LIB_VARIANT).a
    48 
    4932## devnull
    5033include_rtems_HEADERS += devnull/devnull.h
    5134
    52 EXTRA_LIBRARIES += libdevnull.a
    53 CLEANFILES += libdevnull.a
     35noinst_LIBRARIES += libdevnull.a
    5436libdevnull_a_SOURCES = devnull/devnull.c
    5537libdevnull_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    5638
    57 EXTRA_LIBRARIES += libdevnull_g.a
    58 CLEANFILES += libdevnull_g.a
    59 libdevnull_g_a_SOURCES = $(libdevnull_a_SOURCES)
    60 libdevnull_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    61 
    62 TMP_LIBS += libdevnull$(LIB_VARIANT).a
    63 
    6439## dummy
    6540EXTRA_DIST += dummy/README
    6641
    67 EXTRA_LIBRARIES += libdummy.a
    68 CLEANFILES += libdummy.a
     42noinst_LIBRARIES += libdummy.a
    6943libdummy_a_SOURCES = dummy/dummy.c
    7044libdummy_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    7145
    72 EXTRA_LIBRARIES += libdummy_g.a
    73 CLEANFILES += libdummy_g.a
    74 libdummy_g_a_SOURCES = $(libdummy_a_SOURCES)
    75 libdummy_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    76 
    77 TMP_LIBS += libdummy$(LIB_VARIANT).a
    78 
    7946## dumpbuf
    8047include_rtems_HEADERS += dumpbuf/dumpbuf.h
    8148
    82 EXTRA_LIBRARIES += libdumpbuf.a
    83 CLEANFILES += libdumpbuf.a
     49noinst_LIBRARIES += libdumpbuf.a
    8450libdumpbuf_a_SOURCES = dumpbuf/dumpbuf.c
    8551libdumpbuf_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    86 
    87 EXTRA_LIBRARIES += libdumpbuf_g.a
    88 CLEANFILES += libdumpbuf_g.a
    89 libdumpbuf_g_a_SOURCES = $(libdumpbuf_a_SOURCES)
    90 libdumpbuf_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    91 
    92 TMP_LIBS += libdumpbuf$(LIB_VARIANT).a
    9352
    9453## monitor
     
    10564endif
    10665
    107 EXTRA_LIBRARIES += libmonitor.a
    108 CLEANFILES += libmonitor.a
     66noinst_LIBRARIES += libmonitor.a
    10967libmonitor_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    11068
    111 EXTRA_LIBRARIES += libmonitor_g.a
    112 CLEANFILES += libmonitor_g.a
    113 libmonitor_g_a_SOURCES = $(libmonitor_a_SOURCES)
    114 libmonitor_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    115 
    11669EXTRA_DIST += monitor/README
    117 
    118 TMP_LIBS += libmonitor$(LIB_VARIANT).a
    11970
    12071## mw-fb
    12172include_rtems_HEADERS += mw-fb/mw_fb.h mw-fb/mw_uid.h
    12273
    123 EXTRA_LIBRARIES += libmw-fb.a
    124 CLEANFILES += libmw-fb.a
     74noinst_LIBRARIES += libmw-fb.a
    12575libmw_fb_a_SOURCES = mw-fb/mw_fb.c mw-fb/mw_uid.c
    12676libmw_fb_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    12777
    128 EXTRA_LIBRARIES += libmw-fb_g.a
    129 CLEANFILES += libmw-fb_g.a
    130 libmw_fb_g_a_SOURCES = $(libmw_fb_a_SOURCES)
    131 libmw_fb_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    132 
    133 TMP_LIBS += libmw-fb$(LIB_VARIANT).a
    134 
    13578## shell
    13679
     
    13881include_rtems_HEADERS += shell/shell.h
    13982
    140 EXTRA_LIBRARIES += libshell.a
    141 CLEANFILES += libshell.a
     83noinst_LIBRARIES += libshell.a
    14284libshell_a_SOURCES = shell/cmds.c shell/shell.c
    14385libshell_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    144 
    145 EXTRA_LIBRARIES += libshell_g.a
    146 CLEANFILES += libshell_g.a
    147 libshell_g_a_SOURCES = $(libshell_a_SOURCES)
    148 libshell_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    149 
    150 TMP_LIBS += libshell$(LIB_VARIANT).a
    15186endif
    15287
     
    15691include_rtems_HEADERS += rtmonuse/rtmonuse.h
    15792
    158 EXTRA_LIBRARIES += librtmonuse.a
    159 CLEANFILES += librtmonuse.a
     93noinst_LIBRARIES += librtmonuse.a
    16094librtmonuse_a_SOURCES = rtmonuse/rtmonuse.c
    16195librtmonuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    162 
    163 EXTRA_LIBRARIES += librtmonuse_g.a
    164 CLEANFILES += librtmonuse_g.a
    165 librtmonuse_g_a_SOURCES = $(librtmonuse_a_SOURCES)
    166 librtmonuse_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    167 
    168 TMP_LIBS += librtmonuse$(LIB_VARIANT).a
    16996
    17097## serdbg
     
    174101    serdbg/termios_printk_cnf.h serdbg/termios_printk.h
    175102
    176 EXTRA_LIBRARIES += libserdbg.a
    177 CLEANFILES += libserdbg.a
     103noinst_LIBRARIES += libserdbg.a
    178104libserdbg_a_SOURCES = serdbg/serdbg.c serdbg/serdbgio.c \
    179105    serdbg/termios_printk.c
    180106libserdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    181 
    182 EXTRA_LIBRARIES += libserdbg_g.a
    183 CLEANFILES += libserdbg_g.a
    184 libserdbg_g_a_SOURCES = $(libserdbg_a_SOURCES)
    185 libserdbg_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    186 
    187 TMP_LIBS += libserdbg$(LIB_VARIANT).a
    188107endif
    189108
     
    194113include_rtems_HEADERS += stackchk/stackchk.h
    195114
    196 EXTRA_LIBRARIES += libstackchk.a
    197 CLEANFILES += libstackchk.a
     115noinst_LIBRARIES += libstackchk.a
    198116libstackchk_a_SOURCES = stackchk/check.c stackchk/internal.h
    199117libstackchk_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    200118
    201 EXTRA_LIBRARIES += libstackchk_g.a
    202 CLEANFILES += libstackchk_g.a
    203 libstackchk_g_a_SOURCES = $(libstackchk_a_SOURCES)
    204 libstackchk_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    205 
    206 TMP_LIBS += libstackchk$(LIB_VARIANT).a
    207119EXTRA_DIST += stackchk/README
    208120
     
    211123include_rtems_HEADERS += untar/untar.h
    212124
    213 EXTRA_LIBRARIES += libuntar.a
    214 CLEANFILES += libuntar.a
     125noinst_LIBRARIES += libuntar.a
    215126libuntar_a_SOURCES = untar/untar.c
    216127libuntar_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    217128
    218 EXTRA_LIBRARIES += libuntar_g.a
    219 CLEANFILES += libuntar_g.a
    220 libuntar_g_a_SOURCES = $(libuntar_a_SOURCES)
    221 libuntar_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    222 
    223 TMP_LIBS += libuntar$(LIB_VARIANT).a
    224 
    225129EXTRA_DIST += untar/README
    226130
     
    228132include_rtems_HEADERS += fsmount/fsmount.h
    229133
    230 EXTRA_LIBRARIES += libfsmount.a
    231 CLEANFILES += libfsmount.a
     134noinst_LIBRARIES += libfsmount.a
    232135libfsmount_a_SOURCES = fsmount/fsmount.c
    233136libfsmount_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    234137
    235 EXTRA_LIBRARIES += libfsmount_g.a
    236 CLEANFILES += libfsmount_g.a
    237 libfsmount_g_a_SOURCES = $(libfsmount_a_SOURCES)
    238 libfsmount_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    239 
    240 TMP_LIBS += libfsmount$(LIB_VARIANT).a
    241 
    242138EXTRA_DIST += fsmount/README
    243139
    244140## ---
    245141
    246 all-local: $(PREINSTALL_FILES) $(TMP_LIBS)
     142all-local: $(PREINSTALL_FILES)
    247143
    248144PREINSTALL_DIRS =
  • cpukit/librpc/Makefile.am

    rf346774d r846a4af  
    2020man_MANS =
    2121
    22 EXTRA_LIBRARIES = libxdr.a
    23 CLEANFILES += libxdr.a
     22noinst_LIBRARIES = libxdr.a
    2423libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    25 
    26 EXTRA_LIBRARIES += libxdr_g.a
    27 CLEANFILES += libxdr_g.a
    28 libxdr_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    2924
    3025libxdr_a_SOURCES = src/xdr/xdr.c src/xdr/xdr_array.c src/xdr/xdr_float.c \
    3126    src/xdr/xdr_mem.c src/xdr/xdr_rec.c src/xdr/xdr_reference.c \
    3227    src/xdr/xdr_sizeof.c src/xdr/xdr_stdio.c
    33 libxdr_g_a_SOURCES = $(libxdr_a_SOURCES)
    3428endif
    3529
     
    4034man_MANS += $(libxdr_mans)
    4135
    42 all-local: libxdr$(LIB_VARIANT).a
    43 
    44 EXTRA_LIBRARIES += librpc.a
    45 CLEANFILES += librpc.a
     36noinst_LIBRARIES += librpc.a
    4637librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(librpc_CPPFLAGS)
    47 
    48 EXTRA_LIBRARIES += librpc_g.a
    49 CLEANFILES += librpc_g.a
    50 librpc_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(librpc_CPPFLAGS)
    5138
    5239librpc_a_SOURCES = src/rpc/auth_none.c src/rpc/auth_unix.c \
     
    6855    src/rpc/des_soft.c src/rpc/getpublickey.c src/rpc/key_call.c \
    6956    src/rpc/key_prot_xdr.c src/rpc/svc_auth_des.c src/rpc/svc_unix.c
    70 librpc_g_a_SOURCES = $(librpc_a_SOURCES)
    7157
    7258librpc_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \
     
    8268if LIBRPC
    8369man_MANS += $(librpc_mans)
    84 
    85 all-local: librpc$(LIB_VARIANT).a
    8670endif
    8771
  • cpukit/posix/Makefile.am

    rf346774d r846a4af  
    151151AM_CPPFLAGS += -D__RTEMS_INSIDE__
    152152
    153 EXTRA_LIBRARIES = libposix.a
    154 CLEANFILES += libposix.a
     153noinst_LIBRARIES = libposix.a
    155154libposix_a_SOURCES = $(C_FILES)
    156155libposix_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    157156
    158 EXTRA_LIBRARIES += libposix_g.a
    159 CLEANFILES += libposix_g.a
    160 libposix_g_a_SOURCES = $(libposix_a_SOURCES)
    161 libposix_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    162 
    163 all-local: $(PREINSTALL_FILES) libposix$(LIB_VARIANT).a
     157all-local: $(PREINSTALL_FILES)
    164158endif
    165159
  • cpukit/rtems/Makefile.am

    rf346774d r846a4af  
    99AM_CPPFLAGS += -D__RTEMS_INSIDE__
    1010
    11 EXTRA_LIBRARIES = librtems.a
    12 CLEANFILES = librtems.a
     11noinst_LIBRARIES = librtems.a
    1312librtems_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    14 
    15 EXTRA_LIBRARIES += librtems_g.a
    16 CLEANFILES += librtems_g.a
    17 librtems_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    1813
    1914# include
     
    129124    src/regionmp.c src/semmp.c src/signalmp.c src/taskmp.c
    130125endif
    131 librtems_g_a_SOURCES = $(librtems_a_SOURCES)
    132 
    133 all-local: $(PREINSTALL_FILES) librtems$(LIB_VARIANT).a
     126
     127all-local: $(PREINSTALL_FILES)
    134128
    135129PREINSTALL_DIRS =
     
    407401endif
    408402
    409 CLEANFILES += $(PREINSTALL_FILES)
     403CLEANFILES = $(PREINSTALL_FILES)
    410404DISTCLEANFILES = $(PREINSTALL_DIRS)
    411405
  • cpukit/sapi/Makefile.am

    rf346774d r846a4af  
    3131AM_CPPFLAGS += -D__RTEMS_INSIDE__
    3232
    33 EXTRA_LIBRARIES = libsapi.a
    34 CLEANFILES = libsapi.a
     33noinst_LIBRARIES = libsapi.a
    3534libsapi_a_SOURCES = $(C_FILES)
    3635libsapi_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    3736
    38 EXTRA_LIBRARIES += libsapi_g.a
    39 CLEANFILES += libsapi_g.a
    40 libsapi_g_a_SOURCES = $(libsapi_a_SOURCES)
    41 libsapi_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    42 
    43 all-local: $(PREINSTALL_FILES) libsapi$(LIB_VARIANT).a
     37all-local: $(PREINSTALL_FILES)
    4438
    4539PREINSTALL_DIRS =
     
    9488endif
    9589
    96 CLEANFILES += $(PREINSTALL_FILES)
     90CLEANFILES = $(PREINSTALL_FILES)
    9791DISTCLEANFILES = $(PREINSTALL_DIRS)
    9892
  • cpukit/score/Makefile.am

    rf346774d r846a4af  
    147147AM_CPPFLAGS += -D__RTEMS_INSIDE__
    148148
    149 EXTRA_LIBRARIES = libscore.a
    150 CLEANFILES = libscore.a
     149noinst_LIBRARIES = libscore.a
    151150libscore_a_SOURCES = $(C_FILES)
    152151libscore_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    153152
    154 EXTRA_LIBRARIES += libscore_g.a
    155 CLEANFILES += libscore_g.a
    156 libscore_g_a_SOURCES = $(libscore_a_SOURCES)
    157 libscore_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    158 
    159153EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt
    160154
    161 all-local: $(PREINSTALL_FILES) libscore$(LIB_VARIANT).a
     155all-local: $(PREINSTALL_FILES)
    162156
    163157DISTCLEANFILES = include/rtems/score/cpuopts.h
     
    485479endif
    486480
    487 CLEANFILES += $(PREINSTALL_FILES)
     481CLEANFILES = $(PREINSTALL_FILES)
    488482DISTCLEANFILES += $(PREINSTALL_DIRS)
    489483
  • cpukit/wrapup/Makefile.am

    rf346774d r846a4af  
    77
    88## Setup the variant build subdirectory
    9 ARCH_OPTIMIZE_V = o-optimize
    10 ARCH_DEBUG_V = o-debug
     9ARCH = o-optimize
    1110
    12 ARCH__V = $(ARCH_OPTIMIZE_V)
    13 ARCH = $(ARCH_$(VARIANT_V)_V)
    14 
    15 project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a
    16 CLEANFILES = o-optimize/librtemscpu.a
    17 CLEANFILES += o-debug/librtemscpu_g.a
     11project_lib_DATA = librtemscpu.a
     12CLEANFILES = librtemscpu.a
    1813
    1914TMP_LIBS =
    2015if LIBSCORECPU
    21 TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu$(LIB_VARIANT).a
     16TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a
    2217endif
    23 TMP_LIBS += ../score/libscore$(LIB_VARIANT).a
    24 TMP_LIBS += ../sapi/libsapi$(LIB_VARIANT).a
    25 TMP_LIBS += ../rtems/librtems$(LIB_VARIANT).a
     18TMP_LIBS += ../score/libscore.a
     19TMP_LIBS += ../sapi/libsapi.a
     20TMP_LIBS += ../rtems/librtems.a
    2621
    2722if HAS_POSIX
    28 TMP_LIBS += ../posix/libposix$(LIB_VARIANT).a
     23TMP_LIBS += ../posix/libposix.a
    2924endif
    3025
    3126if HAS_ITRON
    32 TMP_LIBS += ../itron/libitron$(LIB_VARIANT).a
     27TMP_LIBS += ../itron/libitron.a
    3328endif
    3429
    35 TMP_LIBS += ../libcsupport/libcsupport$(LIB_VARIANT).a
     30TMP_LIBS += ../libcsupport/libcsupport.a
    3631if !UNIX
    37 TMP_LIBS += ../libblock/libblock$(LIB_VARIANT).a
    38 TMP_LIBS += ../libfs/libdosfs$(LIB_VARIANT).a
     32TMP_LIBS += ../libblock/libblock.a
     33TMP_LIBS += ../libfs/libdosfs.a
    3934endif
    40 TMP_LIBS += ../libfs/libimfs$(LIB_VARIANT).a
     35TMP_LIBS += ../libfs/libimfs.a
    4136
    42 TMP_LIBS += ../libmisc/libmonitor$(LIB_VARIANT).a
    43 TMP_LIBS += ../libmisc/libuntar$(LIB_VARIANT).a
    44 TMP_LIBS += ../libmisc/libstackchk$(LIB_VARIANT).a
    45 TMP_LIBS += ../libmisc/libcpuuse$(LIB_VARIANT).a
    46 TMP_LIBS += ../libmisc/librtmonuse$(LIB_VARIANT).a
     37TMP_LIBS += ../libmisc/libmonitor.a
     38TMP_LIBS += ../libmisc/libuntar.a
     39TMP_LIBS += ../libmisc/libstackchk.a
     40TMP_LIBS += ../libmisc/libcpuuse.a
     41TMP_LIBS += ../libmisc/librtmonuse.a
    4742
    4843## XXX temporarily removed because it causes a
    4944## XXX number of BSPs to not link "main(){}" used by autoconf
    5045# if LIBSERDBG
    51 # TMP_LIBS += ../libmisc/libserdbg$(LIB_VARIANT).a
     46# TMP_LIBS += ../libmisc/libserdbg.a
    5247# endif
    5348
    5449if LIBSHELL
    55 TMP_LIBS += ../libmisc/libshell$(LIB_VARIANT).a
     50TMP_LIBS += ../libmisc/libshell.a
    5651endif
    5752
    58 TMP_LIBS += ../libmisc/libdumpbuf$(LIB_VARIANT).a
    59 TMP_LIBS += ../libmisc/libdevnull$(LIB_VARIANT).a
    60 TMP_LIBS += ../libmisc/libdummy$(LIB_VARIANT).a
    61 TMP_LIBS += ../libmisc/libmw-fb$(LIB_VARIANT).a
    62 TMP_LIBS += ../libmisc/libcapture$(LIB_VARIANT).a
    63 TMP_LIBS += ../libmisc/libfsmount$(LIB_VARIANT).a
     53TMP_LIBS += ../libmisc/libdumpbuf.a
     54TMP_LIBS += ../libmisc/libdevnull.a
     55TMP_LIBS += ../libmisc/libdummy.a
     56TMP_LIBS += ../libmisc/libmw-fb.a
     57TMP_LIBS += ../libmisc/libcapture.a
     58TMP_LIBS += ../libmisc/libfsmount.a
    6459
    6560if HAS_NETWORKING
    66 TMP_LIBS += ../libnetworking/libnetworking$(LIB_VARIANT).a
    67 TMP_LIBS += ../libnetworking/libc$(LIB_VARIANT).a
    68 TMP_LIBS += ../libnetworking/lib$(LIB_VARIANT).a
     61TMP_LIBS += ../libnetworking/libnetworking.a
     62TMP_LIBS += ../libnetworking/libc.a
     63TMP_LIBS += ../libnetworking/lib.a
    6964endif
    7065
    7166if LIBRPC
    72 TMP_LIBS += ../librpc/librpc$(LIB_VARIANT).a
    73 TMP_LIBS += ../librpc/libxdr$(LIB_VARIANT).a
     67TMP_LIBS += ../librpc/librpc.a
     68TMP_LIBS += ../librpc/libxdr.a
    7469endif
    7570
    76 $(ARCH)/librtemscpu$(LIB_VARIANT).a: $(TMP_LIBS)
     71librtemscpu.a: $(TMP_LIBS)
    7772        rm -f $@
    7873        $(mkdir_p) $(ARCH)
     
    114109TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
    115110
    116 $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a: $(ARCH)/librtemscpu$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
    117         $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a
    118 TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a
     111$(PROJECT_LIB)/librtemscpu.a: librtemscpu.a $(PROJECT_LIB)/$(dirstamp)
     112        $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu.a
     113TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu.a
    119114
    120115CLEANFILES += $(TMPINSTALL_FILES)
Note: See TracChangeset for help on using the changeset viewer.