Patches rtems-rc-20000118-3.diff and rtems-rc-20000118-4.diff from

Ralf Corsepius <corsepiu@faw.uni-ulm.de> 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

2 files changed, 48 insertions, 60 deletions

diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
new file mode 100644
index 0000000000..a6ee837cdc
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
@@ -0,0 +1,48 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+H_FILES = ../../shared/include/nvram.h ../../shared/include/bsp.h \
+    ../../../shared/include/coverhd.h
+
+BSP_H_FILES = ../../shared/console/consoleIo.h ../../shared/console/uart.h \
+    ../../shared/irq/irq.h ../../shared/motorola/motorola.h
+
+$(PROJECT_INCLUDE):
+	$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp:
+	$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/nvram.h: ../../shared/include/nvram.h
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/bsp.h: ../../shared/include/bsp.h
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../shared/console/consoleIo.h
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/bsp/uart.h: ../../shared/console/uart.h
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/bsp/irq.h: ../../shared/irq/irq.h
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE)/bsp/motorola.h: ../../shared/motorola/motorola.h
+	$(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
+    $(PROJECT_INCLUDE)/nvram.h $(PROJECT_INCLUDE)/bsp.h \
+    $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/bsp/consoleIo.h \
+    $(PROJECT_INCLUDE)/bsp/uart.h $(PROJECT_INCLUDE)/bsp/irq.h \
+    $(PROJECT_INCLUDE)/bsp/motorola.h
+
+all-local: $(PREINSTALL_FILES)
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in
deleted file mode 100644
index 39692c9cdc..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = include
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES = $(srcdir)/../../shared/include/nvram.h \
-    $(srcdir)/../../shared/include/bsp.h \
-    $(srcdir)/../../../shared/include/coverhd.h
-
-BSP_H_FILES = $(srcdir)/../../shared/console/consoleIo.h \
-    $(srcdir)/../../shared/console/uart.h $(srcdir)/../../shared/irq/irq.h \
-    $(srcdir)/../../shared/motorola/motorola.h
-
-#
-#  Equate files are for including from assembly preprocessed by
-#  gm4 or gasp.  No examples are provided except for those for
-#  other CPUs.  The best way to generate them would be to
-#  provide a program which generates the constants used based
-#  on the C equivalents.
-#
-
-EQ_FILES =
-
-SRCS = $(H_FILES) $(EQ_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-preinstall: 
-	$(mkinstalldirs) $(PROJECT_INCLUDE)
-	$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
-	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-	@$(INSTALL_CHANGE) -m 644 $(BSP_H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: $(SRCS) preinstall
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status