Changeset 2a582aa5 in rtems


Ignore:
Timestamp:
Jul 26, 2002, 1:31:05 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
a85d8ec
Parents:
c3efdb3
Message:

2002-07-26 Ralf Corsepius <corsepiu@…>

  • configure.ac: Disable LIBRPC for the c4x. Check for presence of score/cpu/${RTEMS_CPU}/cpu.c.
  • wrapup/Makefile.am: Reflect changes above. Let librtemscpu.a depend upon libscorecpu.a.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/configure.ac

    rc3efdb3 r2a582aa5  
    6161)
    6262RTEMS_CPU_SUBDIRS([score/cpu])
     63# FIXME: All ports should have a libscorecpu.a - But the powerpc doesn't!
     64AM_CONDITIONAL([LIBSCORECPU],
     65[test -f "${srcdir}/score/cpu/${RTEMS_CPU}/cpu.c"])
    6366
    6467AC_CONFIG_SUBDIRS([libcsupport])
     
    6669AC_CONFIG_SUBDIRS([libfs])
    6770AS_IF([test x"$HAS_NETWORKING" = x"yes"],
    68   [AC_CONFIG_SUBDIRS(libnetworking librpc)])
     71  [AC_CONFIG_SUBDIRS(libnetworking)
     72  AS_IF([test x"$RTEMS_CPU" != x"c4x"],[
     73    AC_CONFIG_SUBDIRS([librpc])
     74    LIBRPC=yes],[
     75    LIBRPC=no
     76  ])
     77])
     78AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
    6979
    7080RTEMS_DEFINE_POSIX_API
  • cpukit/wrapup/Makefile.am

    rc3efdb3 r2a582aa5  
    99include $(top_srcdir)/automake/lib.am
    1010
    11 CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.$(OBJEXT))
     11if LIBSCORECPU
     12CPU_OBJS = ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a
     13endif
    1214CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.$(OBJEXT))
    1315SAPI_OBJS = $(wildcard ../sapi/src/$(ARCH)/*.$(OBJEXT))
     
    3234if HAS_NETWORKING
    3335NETWORKING_OBJS = \
    34     ../libnetworking/wrapup/$(ARCH)/libnetworking.a \
     36    ../libnetworking/wrapup/$(ARCH)/libnetworking.a
     37endif
     38
     39if LIBRPC
     40LIBRPC_OBJS = \
    3541    ../librpc/src/rpc/$(ARCH)/librpc.a \
    3642    ../librpc/src/xdr/$(ARCH)/libxdr.a
     
    4046    $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \
    4147    $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) \
    42     $(NETWORKING_OBJS)
     48    $(NETWORKING_OBJS) $(LIBRPC_OBJS)
    4349
    4450$(LIB): ${OBJS}
     
    7682TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a
    7783
    78 #$(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a: $(LIB)
    79 #       $(INSTALL_DATA) $< $@
    80 
    8184cpulibdir = $(libdir)
    8285cpulib_DATA = $(LIB)
Note: See TracChangeset for help on using the changeset viewer.