diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-07-26 13:31:05 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-07-26 13:31:05 +0000 |
| commit | 2a582aa558973c30b2105695a84d53a1625ed625 (patch) | |
| tree | 6ffb9d3f64a6b0d2faf19535074d06567b47f1d3 /cpukit | |
| parent | 2002-07-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-2a582aa558973c30b2105695a84d53a1625ed625.tar.bz2 | |
2002-07-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/configure.ac | 12 | ||||
| -rw-r--r-- | cpukit/wrapup/Makefile.am | 15 |
2 files changed, 20 insertions, 7 deletions
diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 53b9e7f4df..b6473b08a2 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -60,12 +60,22 @@ AS_IF([test x"$HAS_ITRON_API" = x"yes"], [AC_CONFIG_SUBDIRS(itron)] ) 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([libblock]) AC_CONFIG_SUBDIRS([libfs]) 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_ITRON_API diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 7e0bdd612e..c54904bc4c 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -8,7 +8,9 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.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)) SAPI_OBJS = $(wildcard ../sapi/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 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/xdr/$(ARCH)/libxdr.a endif @@ -39,7 +45,7 @@ endif OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) \ $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \ $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) \ - $(NETWORKING_OBJS) + $(NETWORKING_OBJS) $(LIBRPC_OBJS) $(LIB): ${OBJS} rm -f $@ @@ -75,9 +81,6 @@ $(LIB): ${OBJS} TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a -#$(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a: $(LIB) -# $(INSTALL_DATA) $< $@ - cpulibdir = $(libdir) cpulib_DATA = $(LIB) |