summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/sh/sh7045
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libcpu/sh/sh7045')
-rw-r--r--c/src/lib/libcpu/sh/sh7045/ChangeLog6
-rw-r--r--c/src/lib/libcpu/sh/sh7045/Makefile.am26
-rw-r--r--c/src/lib/libcpu/sh/sh7045/include/Makefile.am31
3 files changed, 31 insertions, 32 deletions
diff --git a/c/src/lib/libcpu/sh/sh7045/ChangeLog b/c/src/lib/libcpu/sh/sh7045/ChangeLog
index 3cc58b2370..6c89084555 100644
--- a/c/src/lib/libcpu/sh/sh7045/ChangeLog
+++ b/c/src/lib/libcpu/sh/sh7045/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/ispsh7045.c: Removed warnings.
diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am
index df317d5069..89e57442d7 100644
--- a/c/src/lib/libcpu/sh/sh7045/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am
@@ -4,7 +4,31 @@
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/io_types.h include/sci.h include/sh7_pfc.h \
+ include/sh7_sci.h include/sci_termios.h
+include_rtems_score_HEADERS = include/ispsh7045.h include/iosh7045.h
+
+$(PROJECT_INCLUDE)/sh:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/sh/%.h: include/%.h
+ $(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/rtems/score/%.h: include/%.h
+ $(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \
+ $(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/sh/%) \
+ $(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/rtems/score/%)
+
+all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../../../automake/subdirs.am
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
deleted file mode 100644
index 4e000e1315..0000000000
--- a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
+++ /dev/null
@@ -1,31 +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 = io_types.h sci.h sh7_pfc.h sh7_sci.h sci_termios.h
-include_rtems_score_HEADERS = ispsh7045.h iosh7045.h
-
-$(PROJECT_INCLUDE)/sh:
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/sh/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \
- $(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/sh/%) \
- $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = io_types.h sci.h sh7_pfc.h sh7_sci.h sci_termios.h
-
-include $(top_srcdir)/../../../../../../automake/local.am