summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/sh/sh7750
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-01-16 11:44:47 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-01-16 11:44:47 +0000
commitbd7b5897190dd958fd3241e7492f282d1fa56445 (patch)
tree196f51e928e04670543c5df333d1d636b49ac2e2 /c/src/lib/libcpu/sh/sh7750
parentc62c75afd4796c3cf8d168fd0c5e574ab4345afa (diff)
downloadrtems-bd7b5897190dd958fd3241e7492f282d1fa56445.tar.bz2
2003-01-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in subdir Makefile.ams * configure.ac: Reflect changes above. * score/Makefile.am: Removed. * sci/Makefile.am: Removed. * timer/Makefile.am: Removed. * clock/Makefile.am: Removed.
Diffstat (limited to 'c/src/lib/libcpu/sh/sh7750')
-rw-r--r--c/src/lib/libcpu/sh/sh7750/ChangeLog9
-rw-r--r--c/src/lib/libcpu/sh/sh7750/Makefile.am64
-rw-r--r--c/src/lib/libcpu/sh/sh7750/clock/Makefile.am27
-rw-r--r--c/src/lib/libcpu/sh/sh7750/configure.ac6
-rw-r--r--c/src/lib/libcpu/sh/sh7750/sci/Makefile.am24
-rw-r--r--c/src/lib/libcpu/sh/sh7750/score/Makefile.am27
-rw-r--r--c/src/lib/libcpu/sh/sh7750/timer/Makefile.am27
7 files changed, 71 insertions, 113 deletions
diff --git a/c/src/lib/libcpu/sh/sh7750/ChangeLog b/c/src/lib/libcpu/sh/sh7750/ChangeLog
index da7bd5b588..2c04346830 100644
--- a/c/src/lib/libcpu/sh/sh7750/ChangeLog
+++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Merge-in subdir Makefile.ams
+ * configure.ac: Reflect changes above.
+ * score/Makefile.am: Removed.
+ * sci/Makefile.am: Removed.
+ * timer/Makefile.am: Removed.
+ * clock/Makefile.am: Removed.
+
2002-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am: Eliminate @RTEMS_BSP@.cfg, $(C_O_FILES).
diff --git a/c/src/lib/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am
index 8c8409eea9..7a83eb16cd 100644
--- a/c/src/lib/libcpu/sh/sh7750/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am
@@ -4,7 +4,8 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
-SUBDIRS = . score clock sci timer
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
@@ -28,7 +29,7 @@ $(PROJECT_INCLUDE)/rtems/score:
$(PROJECT_INCLUDE)/%.h: include/%.h
$(INSTALL_DATA) $< $@
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
$(PROJECT_INCLUDE)/sh \
$(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \
$(PROJECT_INCLUDE)/rtems/score \
@@ -36,5 +37,62 @@ TMPINSTALL_FILES = \
all-local: $(TMPINSTALL_FILES)
-include $(top_srcdir)/../../../../../../automake/subdirs.am
+## clock
+
+PGMS = $(ARCH)/clock.rel
+
+clock_C_FILES = clock/ckinit.c
+clock_rel_OBJECTS = $(clock_C_FILES:clock/%.c=$(ARCH)/%.$(OBJEXT))
+EXTRA_DIST = $(clock_C_FILES)
+
+${ARCH}/%.$(OBJEXT): clock/%.c
+ ${COMPILE} -o $@ -c $<
+${ARCH}/clock.rel: $(clock_rel_OBJECTS)
+ ${make-rel}
+
+## sci
+
+PGMS += $(ARCH)/sci.rel
+
+sci_C_FILES = sci/sh4uart.c
+sci_rel_OBJECTS = $(sci_C_FILES:sci/%.c=$(ARCH)/%.$(OBJEXT))
+EXTRA_DIST += $(sci_C_FILES)
+
+${ARCH}/%.$(OBJEXT): sci/%.c
+ ${COMPILE} -o $@ -c $<
+${ARCH}/sci.rel: $(sci_rel_OBJECTS)
+ ${make-rel}
+
+## score
+
+PGMS += $(ARCH)/score.rel
+
+score_C_FILES = score/cpu_asm.c score/ispsh7750.c
+score_rel_OBJECTS = $(score_C_FILES:score/%.c=$(ARCH)/%.$(OBJEXT))
+EXTRA_DIST += $(score_C_FILES)
+
+${ARCH}/%.$(OBJEXT): score/%.c
+ ${COMPILE} -o $@ -c $<
+${ARCH}/score.rel: $(score_rel_OBJECTS)
+ ${make-rel}
+
+## timer
+
+PGMS += $(ARCH)/timer.rel
+
+timer_C_FILES = timer/timer.c
+timer_rel_OBJECTS = $(timer_C_FILES:timer/%.c=$(ARCH)/%.$(OBJEXT))
+EXTRA_DIST += $(timer_C_FILES)
+
+${ARCH}/%.$(OBJEXT): timer/%.c
+ ${COMPILE} -o $@ -c $<
+${ARCH}/timer.rel: $(timer_rel_OBJECTS)
+ ${make-rel}
+
+# --
+
+all-local: $(ARCH) $(PGMS) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(PGMS)
+
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7750/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7750/clock/Makefile.am
deleted file mode 100644
index 46b0b5e0df..0000000000
--- a/c/src/lib/libcpu/sh/sh7750/clock/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-
-PGM = $(ARCH)/clock.rel
-
-C_FILES = ckinit.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
- $(make-rel)
-
-all-local: $(ARCH) $(OBJS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = ckinit.c
-
-include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7750/configure.ac b/c/src/lib/libcpu/sh/sh7750/configure.ac
index 5324f3b650..40f4074c40 100644
--- a/c/src/lib/libcpu/sh/sh7750/configure.ac
+++ b/c/src/lib/libcpu/sh/sh7750/configure.ac
@@ -27,9 +27,5 @@ RTEMS_CANONICALIZE_TOOLS
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-clock/Makefile
-score/Makefile
-sci/Makefile
-timer/Makefile])
+AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/c/src/lib/libcpu/sh/sh7750/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7750/sci/Makefile.am
deleted file mode 100644
index 78ab677eae..0000000000
--- a/c/src/lib/libcpu/sh/sh7750/sci/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/sci.rel
-
-C_FILES = sh4uart.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
- $(make-rel)
-
-all-local: $(ARCH) $(OBJS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7750/score/Makefile.am b/c/src/lib/libcpu/sh/sh7750/score/Makefile.am
deleted file mode 100644
index 2635b885d8..0000000000
--- a/c/src/lib/libcpu/sh/sh7750/score/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-
-PGM = $(ARCH)/score.rel
-
-C_FILES = cpu_asm.c ispsh7750.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
- $(make-rel)
-
-all-local: $(ARCH) $(OBJS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = ispsh7750.c cpu_asm.c
-
-include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7750/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7750/timer/Makefile.am
deleted file mode 100644
index 40aac3426c..0000000000
--- a/c/src/lib/libcpu/sh/sh7750/timer/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-
-PGM = $(ARCH)/timer.rel
-
-C_FILES = timer.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
- $(make-rel)
-
-all-local: $(ARCH) $(OBJS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = timer.c
-
-include $(top_srcdir)/../../../../../../automake/local.am