Patch rtems-rc-19991117-4.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

    .. a major configuration cleanup
    ... major enhancement of automake support.

    ... and it contains a *major*  breakthough:

    Automake support for libchip and libmisc *LEAF* directories.

    To implement this I have used several nasty tricks
        * The basical trick is to wrap an old Makefile.in's contents into a
          Makefile.am and still continue to use (i.e include) the old
          *.cfg files.

        * Replaced each INSTALL_IF_CHANGE and INSTALL_VARIANT with make
          dependencies
        * Add a gnu-make ifdef AUTOMAKE to main.cfg to avoid conflicts between
          automake and RTEMS make rules
        * Replaced each install:: and preinstall:: rule with make dependencies
        * Replaced SUB_DIRS with SUBDIRS in all Makefile.ins (Automake
          convention)
        * Removed each manually added autoconf substitution which automake
          performs automatically.

    This is not yet full automake support, because using the temporary
    installation directory, preinstallation in general and building variants
    are in contradiction to automake's basic working principles ...

    ... the new Makefile.ams work still somewhat clumsy
    ... nevertheless they work (quite well).

    WARNING:

    At first glance this patch is small, but
        * it affects the whole configuration system.
        * it opens the road to introducing automake to all Makefile.ins
          currently not being under automake control.

    JOEL> Does this remove or add any files?

    Both, all Makefile.ins below libchip and libmisc get replaced with
    Makefile.ams.

17 files changed, 21 insertions, 22 deletions

diff --git a/c/src/tests/mptests/mp01/Makefile.in b/c/src/tests/mptests/mp01/Makefile.in
index c0d268c337..6bbd673a8f 100644
--- a/c/src/tests/mptests/mp01/Makefile.in
+++ b/c/src/tests/mptests/mp01/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp02/Makefile.in b/c/src/tests/mptests/mp02/Makefile.in
index 1586c2add0..d942393b23 100644
--- a/c/src/tests/mptests/mp02/Makefile.in
+++ b/c/src/tests/mptests/mp02/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp03/Makefile.in b/c/src/tests/mptests/mp03/Makefile.in
index 4b4fa81d11..ce63ef6e28 100644
--- a/c/src/tests/mptests/mp03/Makefile.in
+++ b/c/src/tests/mptests/mp03/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp04/Makefile.in b/c/src/tests/mptests/mp04/Makefile.in
index 8b6e2a6aed..fe4f05da14 100644
--- a/c/src/tests/mptests/mp04/Makefile.in
+++ b/c/src/tests/mptests/mp04/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp05/Makefile.in b/c/src/tests/mptests/mp05/Makefile.in
index c982b7bda2..574101d386 100644
--- a/c/src/tests/mptests/mp05/Makefile.in
+++ b/c/src/tests/mptests/mp05/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp06/Makefile.in b/c/src/tests/mptests/mp06/Makefile.in
index 4700f675c8..7a4000577c 100644
--- a/c/src/tests/mptests/mp06/Makefile.in
+++ b/c/src/tests/mptests/mp06/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp07/Makefile.in b/c/src/tests/mptests/mp07/Makefile.in
index 1be1b1596a..fa4d60fedf 100644
--- a/c/src/tests/mptests/mp07/Makefile.in
+++ b/c/src/tests/mptests/mp07/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp08/Makefile.in b/c/src/tests/mptests/mp08/Makefile.in
index 968184beeb..de09094999 100644
--- a/c/src/tests/mptests/mp08/Makefile.in
+++ b/c/src/tests/mptests/mp08/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp09/Makefile.in b/c/src/tests/mptests/mp09/Makefile.in
index 7b597bb03b..11d0839f32 100644
--- a/c/src/tests/mptests/mp09/Makefile.in
+++ b/c/src/tests/mptests/mp09/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp10/Makefile.in b/c/src/tests/mptests/mp10/Makefile.in
index 9b31d660c0..964f8d7794 100644
--- a/c/src/tests/mptests/mp10/Makefile.in
+++ b/c/src/tests/mptests/mp10/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp11/Makefile.in b/c/src/tests/mptests/mp11/Makefile.in
index 37f7e4181b..398ce2c180 100644
--- a/c/src/tests/mptests/mp11/Makefile.in
+++ b/c/src/tests/mptests/mp11/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp12/Makefile.in b/c/src/tests/mptests/mp12/Makefile.in
index 94131edd23..6e5ddf2c64 100644
--- a/c/src/tests/mptests/mp12/Makefile.in
+++ b/c/src/tests/mptests/mp12/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp13/Makefile.in b/c/src/tests/mptests/mp13/Makefile.in
index 87244ff769..ae4b359a05 100644
--- a/c/src/tests/mptests/mp13/Makefile.in
+++ b/c/src/tests/mptests/mp13/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/mptests/mp14/Makefile.in b/c/src/tests/mptests/mp14/Makefile.in
index 0dd9b0a7c9..1b5d888b18 100644
--- a/c/src/tests/mptests/mp14/Makefile.in
+++ b/c/src/tests/mptests/mp14/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/psxtests/support/Makefile.in b/c/src/tests/psxtests/support/Makefile.in
index 9f9e019079..796f19749d 100644
--- a/c/src/tests/psxtests/support/Makefile.in
+++ b/c/src/tests/psxtests/support/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 all: 
 
-SUB_DIRS = include
+SUBDIRS = include
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/samples/base_mp/Makefile.in b/c/src/tests/samples/base_mp/Makefile.in
index 601afedf7d..635d7b11e8 100644
--- a/c/src/tests/samples/base_mp/Makefile.in
+++ b/c/src/tests/samples/base_mp/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = node1 node2
+SUBDIRS = node1 node2
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/tests/tools/generic/Makefile.am b/c/src/tests/tools/generic/Makefile.am
index aa6e1946da..642274f63c 100644
--- a/c/src/tests/tools/generic/Makefile.am
+++ b/c/src/tests/tools/generic/Makefile.am
@@ -9,12 +9,12 @@ noinst_SCRIPTS = difftest sorttimes
 
 project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@
 
-PREINSTALL_DIRS = $(project_bspdir)/tests
 PREINSTALL_FILES = \
-   $(project_bspdir)/tests/difftest \
-   $(project_bspdir)/tests/sorttimes
+$(project_bspdir)/tests \
+$(project_bspdir)/tests/difftest \
+$(project_bspdir)/tests/sorttimes
 
-$(PREINSTALL_DIRS):
+$(project_bspdir)/tests:
 	@$(mkinstalldirs) $@
 
 $(project_bspdir)/tests/difftest: difftest
@@ -23,7 +23,6 @@ $(project_bspdir)/tests/difftest: difftest
 $(project_bspdir)/tests/sorttimes: sorttimes
 	$(INSTALL_SCRIPT) $< $@
 
-## HACK: install to build-tree
-all-local: $(PREINSTALL_DIRS) $(PREINSTALL_FILES)
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../../../automake/local.am