From 1d04e1673eee0ad9247ebbe73249a0f39d600c72 Mon Sep 17 00:00:00 2001 From: Joel Sherrill 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 +++++++------ c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in | 11 ++++++----- c/src/lib/libbsp/sh/gensh1/Makefile.in | 2 +- c/src/lib/libbsp/sh/gensh1/start/Makefile.in | 18 +++++++----------- 5 files changed, 22 insertions(+), 24 deletions(-) (limited to 'c/src/lib/libbsp') 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 diff --git a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in index 7ba478212b..1421998c5d 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in +++ b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in @@ -5,13 +5,16 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = . +top_builddir = ../../.. +subdir = mips64orion/p4000/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) @@ -20,7 +23,7 @@ C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES = idt_csu +S_PIECES = start S_FILES = $(S_PIECES:%=%.S) S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) @@ -32,8 +35,6 @@ include $(RTEMS_ROOT)/make/leaf.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -PGM = ${ARCH}/idt_csu.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 diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.in b/c/src/lib/libbsp/sh/gensh1/Makefile.in index cc83027e42..69aaa0d548 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.in @@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS = include startup scitab wrapup +SUB_DIRS = include start startup scitab wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libbsp/sh/gensh1/start/Makefile.in b/c/src/lib/libbsp/sh/gensh1/start/Makefile.in index abb4b7dbe4..53175c1821 100644 --- a/c/src/lib/libbsp/sh/gensh1/start/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/start/Makefile.in @@ -5,14 +5,15 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = . +top_builddir = ../../.. +subdir = sh/gensh1/start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGMS = ${ARCH}/start.o +PGM = ${ARCH}/start.o # C source names, if any, go here -- minus the .c C_PIECES = @@ -26,8 +27,8 @@ 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 @@ -46,11 +47,6 @@ LD_PATHS += LD_LIBS += LDFLAGS += -# force optimization, unless start.o will not work -# CFLAGS_PROFILE= -# CFLAGS_DEBUG=-O3 -# CFLAGS_OPTIMIZE=-O3 - # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -62,8 +58,8 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: ${ARCH} $(SRCS) $(OBJS) $(PGM) - @$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib + $(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/lib 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