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.

4 files changed, 30 insertions, 31 deletions

diff --git a/c/src/lib/libcpu/sh/sh7032/ChangeLog b/c/src/lib/libcpu/sh/sh7032/ChangeLog
index da13bb5dc9..8155f78fab 100644
--- a/c/src/lib/libcpu/sh/sh7032/ChangeLog
+++ b/c/src/lib/libcpu/sh/sh7032/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>
 
 	* delay/delay.c, score/ispsh7032.c: Removed warnings.
diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am
index d22670b5e7..78dd4408ca 100644
--- a/c/src/lib/libcpu/sh/sh7032/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am
@@ -4,7 +4,30 @@
 
 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
-SUBDIRS = include score clock timer sci delay
+SUBDIRS = . score clock timer sci delay
+
+# 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/sci.h include/sh7_pfc.h include/sh7_sci.h
+include_rtems_score_HEADERS = include/ispsh7032.h include/iosh7032.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/%.h=$(PROJECT_INCLUDE)/sh/%.h) \
+    $(include_rtems_score_HEADERS:include/%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+
+all-local: $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7032/configure.ac b/c/src/lib/libcpu/sh/sh7032/configure.ac
index 8f0a422c3a..e5e10d0b28 100644
--- a/c/src/lib/libcpu/sh/sh7032/configure.ac
+++ b/c/src/lib/libcpu/sh/sh7032/configure.ac
@@ -31,7 +31,6 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 AC_CONFIG_FILES([Makefile
 clock/Makefile
 delay/Makefile
-include/Makefile
 score/Makefile
 timer/Makefile
 sci/Makefile])
diff --git a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am
deleted file mode 100644
index d5d3bc1c79..0000000000
--- a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am
+++ /dev/null
@@ -1,29 +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 = sci.h sh7_pfc.h sh7_sci.h
-include_rtems_score_HEADERS = ispsh7032.h iosh7032.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)
-
-include $(top_srcdir)/../../../../../../automake/local.am