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/sh/sh7045/clock/Makefile.am | 25 ++++++++++--------------- c/src/lib/libcpu/sh/sh7045/include/Makefile.am | 9 +++++---- c/src/lib/libcpu/sh/sh7045/null/Makefile.am | 21 ++++++++------------- c/src/lib/libcpu/sh/sh7045/sci/Makefile.am | 23 +++++++++-------------- c/src/lib/libcpu/sh/sh7045/timer/Makefile.am | 23 +++++++++-------------- 5 files changed, 41 insertions(+), 60 deletions(-) (limited to 'c/src/lib/libcpu/sh/sh7045') diff --git a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am index dee724ecda..0f3042d757 100644 --- a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am @@ -4,22 +4,15 @@ 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) -H_FILES = - -## Assembly source names -S_FILES = -S_O_FILES = $(S_FILES:%.s=${ARCH}/%.o) - -OBJS = $(C_O_FILES) $(S_O_FILES) +OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,11 +20,13 @@ include $(RTEMS_ROOT)/make/leaf.cfg AM_CFLAGS += $(CFLAGS_OS_V) -${PGM}: ${OBJS} - ${make-rel} +$(PGM): $(OBJS) + $(make-rel) + +all-local: $(ARCH) $(OBJS) $(PGM) -all: ${ARCH} $(PGM) +.PRECIOUS: $(PGM) -EXTRA_DIST = $(C_FILES) $(S_FILES) +EXTRA_DIST = ckinit.c include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am index 10a2f74720..7fb244b465 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am @@ -9,16 +9,17 @@ H_FILES = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts -TMPINSTALL_FILES = \ -$(PROJECT_INCLUDE)/sh \ -$(H_FILES:%=$(PROJECT_INCLUDE)/sh/%) - $(PROJECT_INCLUDE)/sh: $(mkinstalldirs) $@ $(PROJECT_INCLUDE)/sh/%.h: %.h $(INSTALL_DATA) $< $@ +TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \ + $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%) + all-local: $(TMPINSTALL_FILES) +EXTRA_DIST = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h + include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am index dcfa2abdd7..67862acb20 100644 --- a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am @@ -4,32 +4,27 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/null.rel +PGM = $(ARCH)/null.rel -## C source names C_FILES = open.c close.c read.c write.c init.c cntrl.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) - -H_FILES = - -## Assembly source names -S_FILES = -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -${PGM}: ${OBJS} +$(PGM): $(OBJS) $(make-rel) -all: ${ARCH} $(PGM) +all-local: $(ARCH) $(OBJS) $(PGM) + +.PRECIOUS: $(PGM) -EXTRA_DIST = $(C_FILES) $(S_FILES) +EXTRA_DIST = close.c cntrl.c init.c open.c read.c write.c include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am index de6da49dae..d28034d8a8 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am @@ -4,32 +4,27 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/sci.rel +PGM = $(ARCH)/sci.rel -## C source names C_FILES = sci.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = - -## Assembly source names -S_FILES = -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -OBJS = $(C_O_FILES) $(S_O_FILES) +OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -${PGM}: ${OBJS} +$(PGM): $(OBJS) $(make-rel) -all: ${ARCH} $(PGM) +all-local: $(ARCH) $(OBJS) $(PGM) + +.PRECIOUS: $(PGM) -EXTRA_DIST = $(C_FILES) $(S_FILES) +EXTRA_DIST = sci.c include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am index 71fffd6b3e..b72f9ca03b 100644 --- a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am @@ -4,32 +4,27 @@ 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) -H_FILES = - -## Assembly source names -S_FILES = -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -OBJS = $(C_O_FILES) $(S_O_FILES) +OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -${PGM}: ${OBJS} +$(PGM): $(OBJS) $(make-rel) -all: ${ARCH} $(PGM) +all-local: $(ARCH) $(OBJS) $(PGM) + +.PRECIOUS: $(PGM) -EXTRA_DIST = $(C_FILES) $(S_FILES) +EXTRA_DIST = timer.c include $(top_srcdir)/../../../../../automake/local.am -- cgit v1.2.3