RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-07-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2002-07-26 13:31:05 +00:00
parent c3efdb3ea9
commit 2a582aa558
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cpukit/configure.ac
View File

@@ -60,12 +60,22 @@ AS_IF([test x"$HAS_ITRON_API" = x"yes"],
[AC_CONFIG_SUBDIRS(itron)] [AC_CONFIG_SUBDIRS(itron)]
) )
RTEMS_CPU_SUBDIRS([score/cpu]) RTEMS_CPU_SUBDIRS([score/cpu])
# FIXME: All ports should have a libscorecpu.a - But the powerpc doesn't!
AM_CONDITIONAL([LIBSCORECPU],
[test -f "${srcdir}/score/cpu/${RTEMS_CPU}/cpu.c"])
AC_CONFIG_SUBDIRS([libcsupport]) AC_CONFIG_SUBDIRS([libcsupport])
AC_CONFIG_SUBDIRS([libblock]) AC_CONFIG_SUBDIRS([libblock])
AC_CONFIG_SUBDIRS([libfs]) AC_CONFIG_SUBDIRS([libfs])
AS_IF([test x"$HAS_NETWORKING" = x"yes"], AS_IF([test x"$HAS_NETWORKING" = x"yes"],
[AC_CONFIG_SUBDIRS(libnetworking librpc)]) [AC_CONFIG_SUBDIRS(libnetworking)
AS_IF([test x"$RTEMS_CPU" != x"c4x"],[
AC_CONFIG_SUBDIRS([librpc])
LIBRPC=yes],[
LIBRPC=no
])
])
AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
RTEMS_DEFINE_POSIX_API RTEMS_DEFINE_POSIX_API
RTEMS_DEFINE_ITRON_API RTEMS_DEFINE_ITRON_API

15
cpukit/wrapup/Makefile.am
View File

@@ -8,7 +8,9 @@ include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am include $(top_srcdir)/automake/lib.am
CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.$(OBJEXT)) if LIBSCORECPU
CPU_OBJS = ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a
endif
CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.$(OBJEXT)) CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.$(OBJEXT))
SAPI_OBJS = $(wildcard ../sapi/src/$(ARCH)/*.$(OBJEXT)) SAPI_OBJS = $(wildcard ../sapi/src/$(ARCH)/*.$(OBJEXT))
RTEMS_OBJS = $(wildcard ../rtems/src/$(ARCH)/*.$(OBJEXT)) RTEMS_OBJS = $(wildcard ../rtems/src/$(ARCH)/*.$(OBJEXT))
@@ -31,7 +33,11 @@ LIBIMFS_OBJS = ../libfs/src/imfs/$(ARCH)/libimfs.a
if HAS_NETWORKING if HAS_NETWORKING
NETWORKING_OBJS = \ NETWORKING_OBJS = \
../libnetworking/wrapup/$(ARCH)/libnetworking.a \ ../libnetworking/wrapup/$(ARCH)/libnetworking.a
endif
if LIBRPC
LIBRPC_OBJS = \
../librpc/src/rpc/$(ARCH)/librpc.a \ ../librpc/src/rpc/$(ARCH)/librpc.a \
../librpc/src/xdr/$(ARCH)/libxdr.a ../librpc/src/xdr/$(ARCH)/libxdr.a
endif endif
@@ -39,7 +45,7 @@ endif
OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) \ OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) \
$(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \ $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \
$(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) \ $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) \
$(NETWORKING_OBJS) $(NETWORKING_OBJS) $(LIBRPC_OBJS)
$(LIB): ${OBJS} $(LIB): ${OBJS}
rm -f $@ rm -f $@
@@ -75,9 +81,6 @@ $(LIB): ${OBJS}
TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a
#$(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a: $(LIB)
# $(INSTALL_DATA) $< $@
cpulibdir = $(libdir) cpulibdir = $(libdir)
cpulib_DATA = $(LIB) cpulib_DATA = $(LIB)