summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/sh/sh7750
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-11-07 22:28:18 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-11-07 22:28:18 +0000
commit7c9a5989c8eab778b7d32a3972fde59d0fba7312 (patch)
tree92a800b06fcd7ed443113bde2e33eb68f8985316 /c/src/lib/libcpu/sh/sh7750
parent2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-7c9a5989c8eab778b7d32a3972fde59d0fba7312.tar.bz2
2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge in include/Makefile.am. * include/Makefile.am: Remove. * configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libcpu/sh/sh7750')
-rw-r--r--c/src/lib/libcpu/sh/sh7750/ChangeLog6
-rw-r--r--c/src/lib/libcpu/sh/sh7750/Makefile.am32
-rw-r--r--c/src/lib/libcpu/sh/sh7750/configure.ac1
-rw-r--r--c/src/lib/libcpu/sh/sh7750/include/Makefile.am36
4 files changed, 37 insertions, 38 deletions
diff --git a/c/src/lib/libcpu/sh/sh7750/ChangeLog b/c/src/lib/libcpu/sh/sh7750/ChangeLog
index d5358f9388..0f6cd01d80 100644
--- a/c/src/lib/libcpu/sh/sh7750/ChangeLog
+++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Merge in include/Makefile.am.
+ * include/Makefile.am: Remove.
+ * configure.ac: Reflect changes above.
+
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* score/cpu_asm.c, score/ispsh7750.c: Removed warnings.
diff --git a/c/src/lib/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am
index df317d5069..8c8409eea9 100644
--- a/c/src/lib/libcpu/sh/sh7750/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am
@@ -4,7 +4,37 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
-SUBDIRS = include score clock sci timer
+SUBDIRS = . score clock sci timer
+
+# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
+# file name conflicts
+include_shdir = $(includedir)/sh
+include_rtems_scoredir = $(includedir)/rtems/score
+
+include_sh_HEADERS = include/sh/sh4uart.h
+include_rtems_score_HEADERS = \
+include/rtems/score/sh7750_regs.h \
+include/rtems/score/ipl.h \
+include/rtems/score/iosh7750.h \
+include/rtems/score/ispsh7750.h \
+include/rtems/score/sh4_regs.h
+
+$(PROJECT_INCLUDE)/sh:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/rtems/score:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%.h: include/%.h
+ $(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = \
+ $(PROJECT_INCLUDE)/sh \
+ $(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \
+ $(PROJECT_INCLUDE)/rtems/score \
+ $(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
+
+all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../../../automake/subdirs.am
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 c26fab38e2..f2212a6a58 100644
--- a/c/src/lib/libcpu/sh/sh7750/configure.ac
+++ b/c/src/lib/libcpu/sh/sh7750/configure.ac
@@ -30,7 +30,6 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
clock/Makefile
-include/Makefile
score/Makefile
sci/Makefile
timer/Makefile])
diff --git a/c/src/lib/libcpu/sh/sh7750/include/Makefile.am b/c/src/lib/libcpu/sh/sh7750/include/Makefile.am
deleted file mode 100644
index 3c25d9931a..0000000000
--- a/c/src/lib/libcpu/sh/sh7750/include/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-##
-## $Id$
-##
-
-
-# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
-# file name conflicts
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_sh_HEADERS = sh/sh4uart.h
-include_rtems_score_HEADERS = \
-rtems/score/sh7750_regs.h \
-rtems/score/ipl.h \
-rtems/score/iosh7750.h \
-rtems/score/ispsh7750.h \
-rtems/score/sh4_regs.h
-
-$(PROJECT_INCLUDE)/sh:
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
- $(PROJECT_INCLUDE)/sh \
- $(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/%) \
- $(PROJECT_INCLUDE)/rtems/score \
- $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../../../automake/local.am