Changeset 33e6983 in rtems


Ignore:
Timestamp:
Dec 9, 2002, 10:39:18 AM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
b41b797
Parents:
3c9fa54
Message:

2002-12-09 Ralf Corsepius <corsepiu@…>

  • wrapup/Makefile.am: Remove *_OBJS, use LIBS+= instead.
  • configure.ac: Require autoconf >= 2.54, automake-1.7.2.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r3c9fa54 r33e6983  
     12002-12-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * wrapup/Makefile.am: Remove *_OBJS, use LIBS+= instead.
     4        * configure.ac: Require autoconf >= 2.54, automake-1.7.2.
     5
    162002-12-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    27
  • cpukit/configure.ac

    r3c9fa54 r33e6983  
    33## $Id$
    44
    5 AC_PREREQ(2.52)
     5AC_PREREQ(2.54)
    66AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
    77AC_CONFIG_SRCDIR([score])
     
    1111RTEMS_CANONICAL_TARGET_CPU
    1212
    13 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
     13AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
    1414AM_MAINTAINER_MODE
    1515
  • cpukit/wrapup/Makefile.am

    r3c9fa54 r33e6983  
    99include $(top_srcdir)/automake/lib.am
    1010
     11LIBS =
    1112if LIBSCORECPU
    12 CPU_OBJS = ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a
     13LIBS += ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a
    1314endif
    14 CORE_OBJS = ../score/$(ARCH)/libscore.a
    15 SAPI_OBJS = ../sapi/$(ARCH)/libsapi.a
    16 RTEMS_OBJS = ../rtems/$(ARCH)/librtems.a
     15LIBS += ../score/$(ARCH)/libscore.a
     16LIBS += ../sapi/$(ARCH)/libsapi.a
     17LIBS += ../rtems/$(ARCH)/librtems.a
    1718
    1819if HAS_POSIX
    19 POSIX_OBJS = ../posix/$(ARCH)/libposix.a
     20LIBS += ../posix/$(ARCH)/libposix.a
    2021endif
    2122
    2223if HAS_ITRON
    23 ITRON_OBJS = ../itron/$(ARCH)/libitron.a
     24LIBS += ../itron/$(ARCH)/libitron.a
    2425endif
    2526
    26 LIBCSUPPORT_OBJS = ../libcsupport/$(ARCH)/libcsupport.a
     27LIBS += ../libcsupport/$(ARCH)/libcsupport.a
    2728
    28 LIBBLOCK_OBJS = ../libblock/$(ARCH)/libblock.a
     29LIBS += ../libblock/$(ARCH)/libblock.a
    2930if !UNIX
    30 LIBDOSFS_OBJS = ../libfs/src/dosfs/$(ARCH)/libdosfs.a
     31LIBS += ../libfs/src/dosfs/$(ARCH)/libdosfs.a
    3132endif
    32 LIBIMFS_OBJS = ../libfs/src/imfs/$(ARCH)/libimfs.a
     33LIBS += ../libfs/src/imfs/$(ARCH)/libimfs.a
    3334
    3435if HAS_NETWORKING
    35 NETWORKING_OBJS = \
    36     ../libnetworking/wrapup/$(ARCH)/libnetworking.a
     36LIBS += ../libnetworking/wrapup/$(ARCH)/libnetworking.a
    3737endif
    3838
    3939if LIBRPC
    40 LIBRPC_OBJS = \
    41     ../librpc/src/rpc/$(ARCH)/librpc.a \
    42     ../librpc/src/xdr/$(ARCH)/libxdr.a
     40LIBS += ../librpc/src/rpc/$(ARCH)/librpc.a
     41LIBS += ../librpc/src/xdr/$(ARCH)/libxdr.a
    4342endif
    4443
    45 OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) \
    46     $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \
    47     $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) \
    48     $(NETWORKING_OBJS) $(LIBRPC_OBJS)
    49 
    50 $(LIB): ${OBJS}
     44$(LIB): ${LIBS}
    5145        rm -f $@
    5246        test -d $(ARCH) || mkdir $(ARCH)
    5347        rm -rf $(ARCH)/*
    54         for f in $(OBJS); do \
     48        for f in $(LIBS); do \
    5549          case $$f in \
    5650          *.$(OBJEXT) | *.rel) \
Note: See TracChangeset for help on using the changeset viewer.