summaryrefslogtreecommitdiffstats
path: root/automake
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-06 20:12:13 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-06 20:12:13 +0000
commita0ea6f10629730e343169614c7c3935048cbf16b (patch)
treeec823176cf8e54daf2691b41fdef1d26e0f1d923 /automake
parent2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-a0ea6f10629730e343169614c7c3935048cbf16b.tar.bz2
2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-newlib.m4: Apply AS_IF. * aclocal/config-subdirs.m4: Remove _RTEMS_PUSH_BUILDDIR, _RTEMS_POP_BUILDDIR, _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR. * aclocal/subdirs.m4: Fix comments, apply AS_IF. * aclocal/sysv-ipc.m4: Reflect autoconf-2.5x canonicalization changes. * aclocal/target.m4: Add _RTEMS_PUSH_BUILDDIR, _RTEMS_POP_BUILDDIR, _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR. * automake/compile.am: Remove librtemsall from LINK_FILES.
Diffstat (limited to '')
-rw-r--r--automake/compile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/automake/compile.am b/automake/compile.am
index 39b26a9055..a6a8ed6fd2 100644
--- a/automake/compile.am
+++ b/automake/compile.am
@@ -59,7 +59,8 @@ LIBC_LIBM = `$(CC) $(CPU_CFLAGS) -print-file-name=libm.a $(GCCSED)`
LIBC_LIBGCC = `$(CC) $(CPU_CFLAGS) -print-libgcc-file-name $(GCCSED)`
### FIXME: False if using multilibbed RTEMS
-LINK_LIBS_RTEMS = $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA)
+LINK_LIBS_RTEMS = $(PROJECT_RELEASE)/lib/librtemsbsp$(LIBSUFFIX_VA) \
+ $(PROJECT_RELEASE)/lib/librtemscpu$(LIBSUFFIX_VA) \
LINK_LIBS_GCC272 = $(LINK_LIBS_RTEMS) $(LIBC_LIBC) $(LIBC_LIBGCC)
GCCSPECS =
@@ -199,7 +200,8 @@ LINK_FILES =\
$(START_FILE) \
$(OBJS) \
$(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \
- $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA)
+ $(PROJECT_RELEASE)/lib/librtemsbsp$(LIBSUFFIX_VA) \
+ $(PROJECT_RELEASE)/lib/librtemscpu$(LIBSUFFIX_VA) \
if RTEMS_USE_GCC
if RTEMS_USE_GCC272