From 01629105c2817a59a4f1f05039593f211cf5ddaa Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 14 Dec 1998 23:15:38 +0000
Subject: Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> to rename all .s
 files to .S in conformance with GNU conventions.  This is a minor step along
 the way to supporting automake.

---
 c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in   |  6 +++---
 c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in |  6 +++---
 c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in |  6 +++---
 c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in |  6 +++---
 c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in   |  6 +++---
 c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in  | 15 ++++++++++-----
 6 files changed, 25 insertions(+), 20 deletions(-)

(limited to 'c/src/lib/libbsp/no_cpu')

diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in
index 48b1c93ac7..c406942630 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.in
@@ -17,10 +17,10 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
 H_FILES=
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_FILES=$(S_PIECES:%=%.S)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in
index b73d23df40..1b9944620b 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.in
@@ -17,10 +17,10 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
 H_FILES=
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_FILES=$(S_PIECES:%=%.S)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in
index b4967b93cb..746f00b638 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.in
@@ -17,10 +17,10 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
 H_FILES=
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_FILES=$(S_PIECES:%=%.S)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in
index 73bea20865..5b1c461c37 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.in
@@ -17,10 +17,10 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
 H_FILES=
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_FILES=$(S_PIECES:%=%.S)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in
index 076b7f4e77..57b562caf2 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.in
@@ -19,10 +19,10 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
 H_FILES=
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_FILES=$(S_PIECES:%=%.S)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
index 4dc4ea5208..eb5d570df5 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
@@ -8,17 +8,22 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console shmsupp timer
-GENERIC_PIECES=shmdr
+BSP_PIECES=startup clock console timer
+GENERIC_PIECES=$
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+ifeq ($(HAS_MP),yes)
+GENERIC_PIECES += shmdr
+BSP_PIECES += shmsupp
+endif
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
      $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libbsp.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
-- 
cgit v1.2.3