From bf423bdb2b207666ab0f18559df9b5e62f8c368e Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 22 Nov 2004 23:32:33 +0000
Subject: 2004-11-22	Jennifer Averett <jennifer@OARcorp.com>

	* Makefile.am, wrapup/Makefile.am: Pick up SHM driver when MP enabled.
---
 c/src/lib/libbsp/powerpc/psim/ChangeLog          |  4 ++++
 c/src/lib/libbsp/powerpc/psim/Makefile.am        |  2 +-
 c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am | 11 ++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index 5543e2c65e..6af9f76ce0 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-22	Jennifer Averett <jennifer@OARcorp.com>
+
+	* Makefile.am, wrapup/Makefile.am: Pick up SHM driver when MP enabled.
+
 2004-11-22	Jennifer Averett <jennifer@OARcorp.com>
 
 	PR 581/bsps
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index f91ba28a0b..069d5bff4b 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUBDIRS = include start irq clock console startup shmsupp timer vectors\
+SUBDIRS = include start irq clock console startup shmsupp timer vectors \
     @exceptions@ wrapup \
     tools
 
diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
index 73cc0afaa8..e838a185e9 100644
--- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
@@ -2,10 +2,19 @@
 ## $Id$
 ##
 
-BSP_PIECES = startup clock console irq vectors
+if HAS_MP
+BSP_MP_O_FILES = shmsupp
+endif
+BSP_PIECES = startup clock console irq vectors $(BSP_MP_O_FILES)
+
+if HAS_MP
+GENERIC_MP_REL_FILES = shmdr
+endif
+GENERIC_FILES = $(GENERIC_MP_REL_FILES)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
+    $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) \
     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.$(OBJEXT)) \
     ../@exceptions@/$(ARCH)/rtems-cpu.rel \
-- 
cgit v1.2.3