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.

13 files changed, 381 insertions, 30 deletions

diff --git a/cpukit/itron/include/Makefile.am b/cpukit/itron/include/Makefile.am
index f83468dd1b..a12590301a 100644
--- a/cpukit/itron/include/Makefile.am
+++ b/cpukit/itron/include/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = itron.h
+H_FILES = itron.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE) \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
@@ -17,9 +17,9 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems itronsys
 
diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am
new file mode 100644
index 0000000000..45b4f8b88e
--- /dev/null
+++ b/cpukit/libmisc/cpuuse/Makefile.am
@@ -0,0 +1,42 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libcpuuse-tmp
+LIB = ${ARCH}/${LIBNAME}.a
+
+C_FILES = cpuuse.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = cpuuse.h
+noinst_HEADERS = $(H_FILES)
+
+SRCS = $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rtems \
+$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+${LIB}: ${SRCS} ${OBJS}
+	$(make-library)
+
+all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
+
+EXTRA_DIST += $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am
new file mode 100644
index 0000000000..296cdc48c6
--- /dev/null
+++ b/cpukit/libmisc/dummy/Makefile.am
@@ -0,0 +1,43 @@
+#
+#  $Id$
+#
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+PGMNAME = dummy
+PGM = ${ARCH}/$(PGMNAME).rel
+
+# C source names, if any, go here -- minus the .c
+C_FILES = dummy.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES =
+
+SRCS = $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+TMPINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rtems \
+$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel
+
+$(PROJECT_INCLUDE)/rtems):
+	@$(mkinstalldirs) $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+${PGM}: ${SRCS} ${OBJS}
+	$(make-rel)
+
+$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel: $(PGM)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(TMPINSTALL_FILES)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am
new file mode 100644
index 0000000000..01e3225ec7
--- /dev/null
+++ b/cpukit/libmisc/dumpbuf/Makefile.am
@@ -0,0 +1,43 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libdumpbuf-tmp
+LIB = ${ARCH}/$(LIBNAME).a
+
+# C source names, if any, go here -- minus the .c
+C_FILES = dumpbuf.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = dumpbuf.h
+noinst_HEADERS = $(H_FILES)
+
+SRCS = $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rtems \
+$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+${LIB}: ${SRCS} ${OBJS}
+	$(make-library)
+
+all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
+
+EXTRA_DIST += $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am
new file mode 100644
index 0000000000..c1567ef917
--- /dev/null
+++ b/cpukit/libmisc/monitor/Makefile.am
@@ -0,0 +1,53 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libmonitor-tmp
+LIB = ${ARCH}/$(LIBNAME).a
+
+# C source names, if any, go here -- minus the .c
+# We only build multiprocessing related files if HAS_MP was defined
+MP_C_FILES = mon-mpci.c
+
+C_FILES = mon-command.c mon-symbols.c mon-prmisc.c mon-monitor.c \
+    mon-object.c mon-server.c mon-task.c mon-queue.c mon-driver.c \
+    mon-dname.c mon-itask.c mon-extension.c mon-manager.c mon-config.c
+
+if HAS_MP
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) $(MP_C_FILES:%.c=${ARCH}/%.o)
+else
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+endif
+
+H_FILES = monitor.h symbols.h
+noinst_HEADERS = $(H_FILES)
+
+SRCS = README $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rtems \
+$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+${LIB}: ${SRCS} ${OBJS}
+	$(make-library)
+
+all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
+
+EXTRA_DIST += $(C_FILES) $(MP_C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/rtmonuse/Makefile.am b/cpukit/libmisc/rtmonuse/Makefile.am
new file mode 100644
index 0000000000..4d2db38b27
--- /dev/null
+++ b/cpukit/libmisc/rtmonuse/Makefile.am
@@ -0,0 +1,42 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = librtmonuse-tmp
+LIB = ${ARCH}/${LIBNAME}.a
+
+C_FILES = rtmonuse.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = rtmonuse.h
+noinst_HEADERS = $(H_FILES)
+
+SRCS = $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rtems \
+$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+${LIB}: ${SRCS} ${OBJS}
+	$(make-library)
+
+all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
+
+EXTRA_DIST += $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/stackchk/Makefile.am b/cpukit/libmisc/stackchk/Makefile.am
new file mode 100644
index 0000000000..4430ffae32
--- /dev/null
+++ b/cpukit/libmisc/stackchk/Makefile.am
@@ -0,0 +1,43 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libstackchk-tmp
+LIB = ${ARCH}/${LIBNAME}.a
+
+C_FILES = check.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = internal.h
+INSTALLED_H_FILES = stackchk.h
+noinst_HEADERS = $(H_FILES) $(INSTALLED_H_FILES)
+
+SRCS = $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rtems \
+$(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+${LIB}: ${SRCS} ${OBJS}
+	$(make-library)
+
+all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
+
+EXTRA_DIST += $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/untar/Makefile.am b/cpukit/libmisc/untar/Makefile.am
new file mode 100644
index 0000000000..2219fec095
--- /dev/null
+++ b/cpukit/libmisc/untar/Makefile.am
@@ -0,0 +1,42 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libuntar-tmp
+LIB = ${ARCH}/${LIBNAME}.a
+
+C_FILES = untar.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = untar.h
+noinst_HEADERS = $(H_FILES)
+
+SRCS = $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rtems \
+$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+${LIB}: ${SRCS} ${OBJS}
+	$(make-library)
+
+all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
+
+EXTRA_DIST += $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/wrapup/Makefile.am b/cpukit/libmisc/wrapup/Makefile.am
new file mode 100644
index 0000000000..f5a62744f0
--- /dev/null
+++ b/cpukit/libmisc/wrapup/Makefile.am
@@ -0,0 +1,43 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libmisc
+LIB = ${ARCH}/$(LIBNAME).a
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a ../untar/$(ARCH)/libuntar-tmp.a \
+    ../stackchk/$(ARCH)/libstackchk-tmp.a ../cpuuse/$(ARCH)/libcpuuse-tmp.a \
+    ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
+    ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a
+
+TMPINSTALL_FILES = \
+$(PROJECT_RELEASE)/lib \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+
+$(PROJECT_RELEASE)/lib:
+	@$(mkinstalldirs) $@
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+	$(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(LIB): $(TMP_LIBS)
+	$(RM) $@
+	$(RM) -r $(ARCH)
+	mkdir $(ARCH)
+	cd $(ARCH); for lib in $^; do \
+                         $(AR) -xv ../$$lib; \
+                    done
+	$(AR) ruv $@ $(ARCH)/*
+	$(RANLIB) $@
+
+all: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/librpc/include/rpc/Makefile.am b/cpukit/librpc/include/rpc/Makefile.am
index a4753a7ba5..49b4706d1e 100644
--- a/cpukit/librpc/include/rpc/Makefile.am
+++ b/cpukit/librpc/include/rpc/Makefile.am
@@ -5,11 +5,11 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 if HAS_NETWORKING
-H_PIECES = auth.h rpc.h svc.h types.h clnt.h rpc_msg.h svc_auth.h xdr.h
+H_FILES = auth.h rpc.h svc.h types.h clnt.h rpc_msg.h svc_auth.h xdr.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rpc \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rpc/%)
 
@@ -19,8 +19,8 @@ $(PROJECT_INCLUDE)/rpc/%.h: %.h
 	$(INSTALL_DATA) $< $@
 endif
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/posix/include/Makefile.am b/cpukit/posix/include/Makefile.am
index 57e98bd79d..01adb60973 100644
--- a/cpukit/posix/include/Makefile.am
+++ b/cpukit/posix/include/Makefile.am
@@ -6,11 +6,11 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 ## RTEMS unistd.h needs to be checked against newlib's and removed
 #noinst_HEADERS= devctl.h intr.h
-H_PIECES = pthread.h sched.h aio.h mqueue.h semaphore.h
+H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE) \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
@@ -19,9 +19,9 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems sys
 
diff --git a/cpukit/rtems/include/Makefile.am b/cpukit/rtems/include/Makefile.am
index 11a9596ea1..8935b30100 100644
--- a/cpukit/rtems/include/Makefile.am
+++ b/cpukit/rtems/include/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = rtems.h
+H_FILES = rtems.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE) \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
@@ -17,9 +17,9 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems
 
diff --git a/cpukit/sapi/include/Makefile.am b/cpukit/sapi/include/Makefile.am
index 51835ffd51..5391ab5d89 100644
--- a/cpukit/sapi/include/Makefile.am
+++ b/cpukit/sapi/include/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = confdefs.h
+H_FILES = confdefs.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE) \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
@@ -17,9 +17,9 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems