Changeset b178462c in rtems


Ignore:
Timestamp:
Jan 11, 2004, 5:50:53 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
53fa63e
Parents:
bf9ea48
Message:

2004-01-11 Ralf Corsepius <corsepiu@…>

  • wrapup/Makefile.am: Include compile.am. Use TMP_LIBS instead of LIBS to avoid potential conflicts with auto*tools' LIBS. Reflect new locations of libscorecpu*.a
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rbf9ea48 rb178462c  
     12004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * wrapup/Makefile.am: Include compile.am.
     4        Use TMP_LIBS instead of LIBS to avoid potential conflicts with
     5        auto*tools' LIBS.
     6        Reflect new locations of libscorecpu*.a
     7
    182004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • cpukit/wrapup/Makefile.am

    rbf9ea48 rb178462c  
    44
    55include $(top_srcdir)/automake/multilib.am
    6 include $(top_srcdir)/automake/amcompile.am
     6include $(top_srcdir)/automake/compile.am
    77
    88## Setup the variant build subdirectory
     
    1818
    1919project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a
     20CLEANFILES = o-optimize/librtemscpu.a
     21CLEANFILES += o-debug/librtemscpu_g.a
    2022
    21 LIBS =
     23TMP_LIBS =
    2224if LIBSCORECPU
    23 LIBS += ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a
     25TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu$(LIB_VARIANT).a
    2426endif
    25 LIBS += ../score/libscore$(LIB_VARIANT).a
    26 LIBS += ../sapi/libsapi$(LIB_VARIANT).a
    27 LIBS += ../rtems/librtems$(LIB_VARIANT).a
     27TMP_LIBS += ../score/libscore$(LIB_VARIANT).a
     28TMP_LIBS += ../sapi/libsapi$(LIB_VARIANT).a
     29TMP_LIBS += ../rtems/librtems$(LIB_VARIANT).a
    2830
    2931if HAS_POSIX
    30 LIBS += ../posix/libposix$(LIB_VARIANT).a
     32TMP_LIBS += ../posix/libposix$(LIB_VARIANT).a
    3133endif
    3234
    3335if HAS_ITRON
    34 LIBS += ../itron/libitron$(LIB_VARIANT).a
     36TMP_LIBS += ../itron/libitron$(LIB_VARIANT).a
    3537endif
    3638
    37 LIBS += ../libcsupport/libcsupport$(LIB_VARIANT).a
     39TMP_LIBS += ../libcsupport/libcsupport$(LIB_VARIANT).a
    3840
    39 LIBS += ../libblock/libblock$(LIB_VARIANT).a
     41TMP_LIBS += ../libblock/libblock$(LIB_VARIANT).a
    4042if !UNIX
    41 LIBS += ../libfs/libdosfs$(LIB_VARIANT).a
     43TMP_LIBS += ../libfs/libdosfs$(LIB_VARIANT).a
    4244endif
    43 LIBS += ../libfs/libimfs$(LIB_VARIANT).a
     45TMP_LIBS += ../libfs/libimfs$(LIB_VARIANT).a
    4446
    45 LIBS += ../libmisc/libmonitor$(LIB_VARIANT).a
    46 LIBS += ../libmisc/libuntar$(LIB_VARIANT).a
    47 LIBS += ../libmisc/libstackchk$(LIB_VARIANT).a
    48 LIBS += ../libmisc/libcpuuse$(LIB_VARIANT).a
    49 LIBS += ../libmisc/librtmonuse$(LIB_VARIANT).a
     47TMP_LIBS += ../libmisc/libmonitor$(LIB_VARIANT).a
     48TMP_LIBS += ../libmisc/libuntar$(LIB_VARIANT).a
     49TMP_LIBS += ../libmisc/libstackchk$(LIB_VARIANT).a
     50TMP_LIBS += ../libmisc/libcpuuse$(LIB_VARIANT).a
     51TMP_LIBS += ../libmisc/librtmonuse$(LIB_VARIANT).a
    5052
    5153## XXX temporarily removed because it causes a
    5254## XXX number of BSPs to not link "main(){}" used by autoconf
    5355# if LIBSERDBG
    54 # LIBS += ../libmisc/libserdbg$(LIB_VARIANT).a
     56# TMP_LIBS += ../libmisc/libserdbg$(LIB_VARIANT).a
    5557# endif
    5658
    5759if LIBSHELL
    58 LIBS += ../libmisc/libshell$(LIB_VARIANT).a
     60TMP_LIBS += ../libmisc/libshell$(LIB_VARIANT).a
    5961endif
    6062
    61 LIBS += ../libmisc/libdumpbuf$(LIB_VARIANT).a
    62 LIBS += ../libmisc/libdevnull$(LIB_VARIANT).a
    63 LIBS += ../libmisc/libdummy$(LIB_VARIANT).a
    64 LIBS += ../libmisc/libmw-fb$(LIB_VARIANT).a
    65 LIBS += ../libmisc/libcapture$(LIB_VARIANT).a
    66 LIBS += ../libmisc/libfsmount$(LIB_VARIANT).a
     63TMP_LIBS += ../libmisc/libdumpbuf$(LIB_VARIANT).a
     64TMP_LIBS += ../libmisc/libdevnull$(LIB_VARIANT).a
     65TMP_LIBS += ../libmisc/libdummy$(LIB_VARIANT).a
     66TMP_LIBS += ../libmisc/libmw-fb$(LIB_VARIANT).a
     67TMP_LIBS += ../libmisc/libcapture$(LIB_VARIANT).a
     68TMP_LIBS += ../libmisc/libfsmount$(LIB_VARIANT).a
    6769
    6870if HAS_NETWORKING
    69 LIBS += ../libnetworking/libnetworking$(LIB_VARIANT).a
    70 LIBS += ../libnetworking/libc$(LIB_VARIANT).a
    71 LIBS += ../libnetworking/lib$(LIB_VARIANT).a
     71TMP_LIBS += ../libnetworking/libnetworking$(LIB_VARIANT).a
     72TMP_LIBS += ../libnetworking/libc$(LIB_VARIANT).a
     73TMP_LIBS += ../libnetworking/lib$(LIB_VARIANT).a
    7274endif
    7375
    7476if LIBRPC
    75 LIBS += ../librpc/librpc$(LIB_VARIANT).a
    76 LIBS += ../librpc/libxdr$(LIB_VARIANT).a
     77TMP_LIBS += ../librpc/librpc$(LIB_VARIANT).a
     78TMP_LIBS += ../librpc/libxdr$(LIB_VARIANT).a
    7779endif
    7880
    79 $(LIBS): $(ARCH)/$(dirstamp)
    80 
    81 $(ARCH)/librtemscpu$(LIB_VARIANT).a: ${LIBS}
     81$(ARCH)/librtemscpu$(LIB_VARIANT).a: $(TMP_LIBS) $(ARCH)/$(dirstamp)
    8282        rm -f $@
    8383        rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
    84         for f in $(LIBS); do \
     84        for f in $(TMP_LIBS); do \
    8585          case $$f in \
    8686          *.$(OBJEXT) | *.rel) \
Note: See TracChangeset for help on using the changeset viewer.