From 1d04e1673eee0ad9247ebbe73249a0f39d600c72 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 16 Nov 1999 13:45:51 +0000
Subject: Moved start code from lib/start to libbsp.

---
 c/src/lib/libbsp/i960/cvme961/Makefile.in       |  2 +-
 c/src/lib/libbsp/i960/cvme961/start/Makefile.in | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.in b/c/src/lib/libbsp/i960/cvme961/Makefile.in
index 07804ae5a2..864abba724 100644
--- a/c/src/lib/libbsp/i960/cvme961/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/Makefile.in
@@ -24,7 +24,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include startup clock console $(MP_SUPPORT) timer wrapup
+SUB_DIRS = include start startup clock console $(MP_SUPPORT) timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in b/c/src/lib/libbsp/i960/cvme961/start/Makefile.in
index 30f1afcf02..986fc61d6f 100644
--- a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/start/Makefile.in
@@ -5,13 +5,16 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = .
+top_builddir = ../../..
+subdir = i960/cvme961/start
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
+PGM = ${ARCH}/start.o
+
 # C source names, if any, go here -- minus the .c
 C_PIECES =
 C_FILES = $(C_PIECES:%=%.c)
@@ -24,16 +27,14 @@ S_PIECES = start
 S_FILES = $(S_PIECES:%=%.S)
 S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
 
-SRCS = $(C_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(S_O_FILES)
+SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
+OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-PGM = ${ARCH}/start.o
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -61,4 +62,4 @@ all: ${ARCH} $(SRCS) $(OBJS) $(PGM)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
-	 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-- 
cgit v1.2.3