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/libcpu/sparc/reg_win/Makefile.am | 12 +++++++----- c/src/lib/libcpu/sparc/syscall/Makefile.am | 15 ++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'c/src/lib/libcpu/sparc') diff --git a/c/src/lib/libcpu/sparc/reg_win/Makefile.am b/c/src/lib/libcpu/sparc/reg_win/Makefile.am index b41bfba876..91a8f1feb1 100644 --- a/c/src/lib/libcpu/sparc/reg_win/Makefile.am +++ b/c/src/lib/libcpu/sparc/reg_win/Makefile.am @@ -4,10 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/reg_win.rel +PGM = $(ARCH)/reg_win.rel S_FILES = window.S -reg_win_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o) +reg_win_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../automake/lib.am @@ -21,11 +21,13 @@ AM_CFLAGS = $(CFLAGS_OS_V) $(PGM): $(reg_win_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # libbsp/sparc/BSP/wrapup/Makefile -EXTRA_DIST = $(S_FILES) +all-local: $(ARCH) $(reg_win_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + +EXTRA_DIST = window.S include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sparc/syscall/Makefile.am b/c/src/lib/libcpu/sparc/syscall/Makefile.am index 1466361945..e0246b2829 100644 --- a/c/src/lib/libcpu/sparc/syscall/Makefile.am +++ b/c/src/lib/libcpu/sparc/syscall/Makefile.am @@ -4,15 +4,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/syscall.rel +PGM = $(ARCH)/syscall.rel ## Assembly sources S_FILES = syscall.S H_FILES = syscall.h -noinst_HEADERS = $(H_FILES) -syscall_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o) +syscall_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../automake/lib.am @@ -26,11 +25,13 @@ AM_CFLAGS = $(CFLAGS_OS_V) $(PGM): $(syscall_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - -EXTRA_DIST = $(S_FILES) - # the .rel file built here will be put into libbsp.a by # libbsp/sparc/BSP/wrapup/Makefile +all-local: $(ARCH) $(syscall_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + +EXTRA_DIST = syscall.S syscall.h + include $(top_srcdir)/../../../../../automake/local.am -- cgit v1.2.3