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/sparc/erc32/clock/Makefile.am | 15 +++--- c/src/lib/libbsp/sparc/erc32/console/Makefile.am | 15 +++--- c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am | 13 ++--- c/src/lib/libbsp/sparc/erc32/include/Makefile.am | 7 +-- c/src/lib/libbsp/sparc/erc32/start/Makefile.am | 17 ++++-- c/src/lib/libbsp/sparc/erc32/startup/Makefile.am | 15 +++--- c/src/lib/libbsp/sparc/erc32/timer/Makefile.am | 15 +++--- c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am | 35 +++++++++++++ c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in | 63 ----------------------- 9 files changed, 91 insertions(+), 104 deletions(-) create mode 100644 c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in (limited to 'c/src/lib/libbsp/sparc') diff --git a/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am b/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am index 542d572b47..0b1ebe8a61 100644 --- a/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/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/sparc/erc32/console/Makefile.am b/c/src/lib/libbsp/sparc/erc32/console/Makefile.am index 1de95a6b17..bb01430dfc 100644 --- a/c/src/lib/libbsp/sparc/erc32/console/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/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 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 diff --git a/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am b/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am index 7e30b7126c..b00b01bff3 100644 --- a/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am @@ -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 diff --git a/c/src/lib/libbsp/sparc/erc32/include/Makefile.am b/c/src/lib/libbsp/sparc/erc32/include/Makefile.am index fd65550e77..43cf28d6c2 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/include/Makefile.am @@ -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 diff --git a/c/src/lib/libbsp/sparc/erc32/start/Makefile.am b/c/src/lib/libbsp/sparc/erc32/start/Makefile.am index 61a4cfd7ad..824d7a22c5 100644 --- a/c/src/lib/libbsp/sparc/erc32/start/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/start/Makefile.am @@ -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 diff --git a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am index be6f29e3b9..540fe1f7a6 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/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 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 diff --git a/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am b/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am index e328fd92b0..7f16dcc233 100644 --- a/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/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 -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 diff --git a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am new file mode 100644 index 0000000000..5871eeac1f --- /dev/null +++ b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am @@ -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 diff --git a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in deleted file mode 100644 index 3da476d31f..0000000000 --- a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in +++ /dev/null @@ -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 -- cgit v1.2.3