Changeset 846a4af in rtems for cpukit/wrapup


Ignore:
Timestamp:
Jan 1, 2005, 10:41:29 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, 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.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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.