Patches rtems-rc-20000118-3.diff and rtems-rc-20000118-4.diff from

Ralf Corsepius <corsepiu@faw.uni-ulm.de> that contain:

    * Modifications, (minor) corrections, cleanups to most existing
      Makefile.ams
    * Adds automake support to all remaining BSPs which have not yet been
      converted to automake.
    * Makefile.am for all remaining wrapup/Makefile.ams
This commit is contained in:
Joel Sherrill
2000-01-31 15:27:02 +00:00
parent 8fbdf07b62
commit 4e36a2f133
589 changed files with 8531 additions and 15126 deletions

View File

@@ -4,11 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
PGM = ${ARCH}/clock.rel
PGM = $(ARCH)/clock.rel
## C source names
C_FILES = ckinit.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES)
@@ -19,11 +18,15 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): ${OBJS}
$(PGM): $(OBJS)
$(make-rel)
all-local: ${ARCH} $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
all-local: $(ARCH) $(OBJS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = ckinit.c
include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -4,11 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
PGM = ${ARCH}/console.rel
PGM = $(ARCH)/console.rel
## C source names
C_FILES = console.c consolereserveresources.c debugputs.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES)
@@ -19,13 +18,15 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): ${OBJS}
$(PGM): $(OBJS)
$(make-rel)
all-local: ${ARCH} $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
EXTRA_DIST = $(C_FILES)
all-local: $(ARCH) $(OBJS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = console.c consolereserveresources.c debugputs.c
include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -6,11 +6,10 @@ AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = ${ARCH}/gnatsupp.rel
PGM = $(ARCH)/gnatsupp.rel
## C source names
C_FILES = gnatsupp.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES)
@@ -21,11 +20,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): ${OBJS}
$(PGM): $(OBJS)
$(make-rel)
all-local: ${ARCH} $(PGM)
all-local: $(ARCH) $(OBJS) $(PGM)
EXTRA_DIST = $(C_FILES)
.PRECIOUS: $(PGM)
EXTRA_DIST = gnatsupp.c
include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -5,9 +5,6 @@
AUTOMAKE_OPTIONS = foreign 1.4
H_FILES = bsp.h coverhd.h
noinst_HEADERS = $(H_FILES)
PREINSTALL_FILES = $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
@@ -15,6 +12,10 @@ $(PROJECT_INCLUDE):
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = bsp.h coverhd.h
include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -4,11 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
PGM = ${ARCH}/start.o
PGM = $(ARCH)/start.o
## Assembly source names
S_FILES = start.S
S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
OBJS = $(S_O_FILES)
@@ -19,7 +18,15 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
all-local: ${ARCH} $(PGM)
$(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/lib
$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(PGM)
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGM)
EXTRA_DIST = start.S
include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -6,12 +6,11 @@ AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = ${ARCH}/startup.rel
PGM = $(ARCH)/startup.rel
## C source names
C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c main.c bootcard.c sbrk.c \
setvec.c spurious.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES)
@@ -26,16 +25,18 @@ include $(top_srcdir)/../../../../../../automake/lib.am
AM_CPPFLAGS += -DUSE_INIT_FINI
$(PGM): ${OBJS}
$(PGM): $(OBJS)
$(make-rel)
$(PROJECT_RELEASE)/lib/linkcmds: linkcmds
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib/linkcmds
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
all-local: ${ARCH} $(PGM) $(TMPINSTALL_FILES)
all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
EXTRA_DIST = bspclean.c bspstart.c setvec.c spurious.c linkcmds
.PRECIOUS: $(PGM)
EXTRA_DIST = bspclean.c bspstart.c linkcmds setvec.c spurious.c
include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -4,11 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
PGM = ${ARCH}/timer.rel
PGM = $(ARCH)/timer.rel
## C source names
C_FILES = timer.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES)
@@ -19,13 +18,15 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): ${OBJS}
$(PGM): $(OBJS)
$(make-rel)
all-local: ${ARCH} $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
EXTRA_DIST = $(C_FILES)
all-local: $(ARCH) $(OBJS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = timer.c
include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -0,0 +1,35 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
BSP_PIECES = startup console clock timer gnatsupp
# pieces to pick up out of libcpu/sparc
CPU_PIECES = reg_win syscall
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
$(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(LIB): $(OBJS)
$(make-library)
$(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a
all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
.PRECIOUS: $(LIB)
include $(top_srcdir)/../../../../../../automake/local.am

View File

@@ -1,63 +0,0 @@
#
# $Id$
#
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ..
subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
BSP_PIECES = startup console clock timer gnatsupp
# pieces to pick up out of libcpu/sparc
CPU_PIECES = reg_win syscall
GENERIC_PIECES =
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
$(foreach piece, $(CPU_PIECES), \
../../../../libcpu/$(RTEMS_CPU)/$(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
INSTALL_CHANGE = @INSTALL_CHANGE@
#
# (OPTIONAL) Add local stuff here using +=
#
DEFINES +=
CPPFLAGS +=
CFLAGS +=
LD_PATHS +=
LD_LIBS +=
LDFLAGS +=
#
# Add your list of files to delete here. The config files
# already know how to delete some stuff, so you may want
# to just run 'make clean' first to see what gets missed.
# 'make clobber' already includes 'make clean'
#
CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS +=
$(LIB): ${OBJS}
$(make-library)
all: ${ARCH} $(SRCS) $(LIB)
$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status