From 4e36a2f133c68aaf637e166385eff1a05b59f38e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 31 Jan 2000 15:27:02 +0000 Subject: Patches rtems-rc-20000118-3.diff and rtems-rc-20000118-4.diff from Ralf Corsepius 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 --- c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am | 15 +++-- c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am | 15 ++--- c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am | 11 ++-- c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am | 12 ++-- c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am | 15 ++--- c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am | 15 ++--- c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am | 44 ++++++++++++++ c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in | 67 ---------------------- 8 files changed, 87 insertions(+), 107 deletions(-) create mode 100644 c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in (limited to 'c/src/lib/libbsp/no_cpu') diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am index 542d572b47..0b1ebe8a61 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am @@ -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 diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am index 124c211820..82b58ef82e 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/console.rel +PGM = $(ARCH)/console.rel -## C source names C_FILES = console.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 include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am index 6996451fa0..a97b688f4f 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am @@ -5,22 +5,21 @@ AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = bsp.h -noinst_HEADERS = $(H_FILES) $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h +$(PROJECT_INCLUDE)/bsp.h: bsp.h $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE)/coverhd.h: $(srcdir)/../../../shared/include/coverhd.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ -$(PROJECT_INCLUDE)/coverhd.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ + $(PROJECT_INCLUDE)/coverhd.h all-local: $(TMPINSTALL_FILES) +EXTRA_DIST = bsp.h + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am index 7932696f8c..9bf07cebd4 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/shmsupp.rel +PGM = $(ARCH)/shmsupp.rel ## C source names C_FILES = addrconv.c getcfg.c lock.c mpisr.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -19,17 +19,15 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(PGM): ${OBJS} +$(PGM): $(OBJS) $(make-rel) if HAS_MP -all-local: ${ARCH} $(PGM) -else -all-local: +all-local: $(ARCH) $(PGM) endif # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -EXTRA_DIST = $(C_FILES) +EXTRA_DIST = addrconv.c getcfg.c lock.c mpisr.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am index 463ae664af..2b0174264f 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am @@ -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 gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -22,16 +21,18 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(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 main.c setvec.c linkcmds +.PRECIOUS: $(PGM) + +EXTRA_DIST = bspclean.c bspstart.c linkcmds main.c setvec.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am index 1923d55d64..e07e5caa10 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/timer.rel +PGM = $(ARCH)/timer.rel -## C source names C_FILES = timer.c timerisr.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 timerisr.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am new file mode 100644 index 0000000000..8d9f683f77 --- /dev/null +++ b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am @@ -0,0 +1,44 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +BSP_FILES = startup clock console timer + +if HAS_MP +GENERIC_MP_REL_FILES = shmdr +endif +GENERIC_FILES = $(GENERIC_MP_REL_FILES) + +if HAS_MP +BSP_MP_O_FILES = shmsupp +endif +BSP_FILES = $(BSP_MP_O_FILES) + +# bummer; have to use $foreach since % pattern subst rules only replace 1x +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(foreach piece, $(GENERIC_FILES), ../../../$(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 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 deleted file mode 100644 index 612c648cf0..0000000000 --- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in +++ /dev/null @@ -1,67 +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@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -BSP_PIECES = startup clock console timer - -GENERIC_MP_REL_PIECES_yes_V = shmdr -GENERIC_MP_REL_PIECES_no_V = -GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) - -BSP_MP_O_PIECES_yes_V = shmsupp -BSP_MP_O_PIECES_no_V = -BSP_PIECES += $(BSP_MP_O_PIECES_$(HAS_MP)_V) - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(GENERIC_PIECES), \ - ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB = $(ARCH)/libbsp.a - -# -# (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 -- cgit v1.2.3