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.

88 files changed, 635 insertions, 896 deletions

diff --git a/c/src/lib/include/Makefile.am b/c/src/lib/include/Makefile.am
index 363223b878..76d08e35a7 100644
--- a/c/src/lib/include/Makefile.am
+++ b/c/src/lib/include/Makefile.am
@@ -4,12 +4,12 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \
+H_FILES = chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \
     timerdrv.h vmeintr.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE) \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
@@ -18,9 +18,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 = sys motorola zilog
 
diff --git a/c/src/lib/include/motorola/Makefile.am b/c/src/lib/include/motorola/Makefile.am
index 498d5b6def..91323785d8 100644
--- a/c/src/lib/include/motorola/Makefile.am
+++ b/c/src/lib/include/motorola/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = mc68230.h mc68681.h
+H_FILES = mc68230.h mc68681.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/motorola \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%)
 
@@ -17,8 +17,8 @@ $(PROJECT_INCLUDE)/motorola:
 $(PROJECT_INCLUDE)/motorola/%.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)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/include/sys/Makefile.am b/c/src/lib/include/sys/Makefile.am
index 2f912276a2..a43a93216d 100644
--- a/c/src/lib/include/sys/Makefile.am
+++ b/c/src/lib/include/sys/Makefile.am
@@ -6,19 +6,19 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 if HAS_NETWORKING
 else
-NETWORKING_H_PIECES += ioctl.h
+NETWORKING_H_FILES += ioctl.h
 endif
 
 if UNIX
 else
-NEWLIB_H_PIECES += termios.h
+NEWLIB_H_FILES += termios.h
 endif
 
-H_PIECES += utime.h $(NEWLIB_H_PIECES) $(NETWORKING_H_PIECES)
+H_FILES += utime.h $(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/sys \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
 
@@ -27,8 +27,8 @@ $(PROJECT_INCLUDE)/sys:
 $(PROJECT_INCLUDE)/sys/%.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)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/include/zilog/Makefile.am b/c/src/lib/include/zilog/Makefile.am
index 8dcef9893c..ec750d0097 100644
--- a/c/src/lib/include/zilog/Makefile.am
+++ b/c/src/lib/include/zilog/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = z8036.h z8530.h z8536.h
+H_FILES = z8036.h z8530.h z8536.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/zilog \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%)
 
@@ -17,8 +17,8 @@ $(PROJECT_INCLUDE)/zilog:
 $(PROJECT_INCLUDE)/zilog/%.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)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/Makefile.in b/c/src/lib/libbsp/Makefile.in
index b2ab366bd7..e764a83e68 100644
--- a/c/src/lib/libbsp/Makefile.in
+++ b/c/src/lib/libbsp/Makefile.in
@@ -27,7 +27,7 @@ $(INSTALLDIRS):
 # We only build it if HAS_MP was defined
 @HAS_MP_TRUE@MP_DRIVERS = shmdr
 
-SUB_DIRS = $(MP_DRIVERS)
+SUBDIRS = $(MP_DRIVERS)
 
 # If we are building a "real" BSP, then we need to descend into the
 # appropriate CPU specific directory.  The bare BSP is a special
@@ -35,7 +35,7 @@ SUB_DIRS = $(MP_DRIVERS)
 # level as the CPUs.  If we are building the bare BSP, then descend
 # into that directory.
 
-SUB_DIRS += @RTEMS_LIBBSP_CPU_SUBDIR@
+SUBDIRS += @RTEMS_LIBBSP_CPU_SUBDIR@
 
 preinstall: 
 	@$(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/lib
diff --git a/c/src/lib/libbsp/a29k/Makefile.in b/c/src/lib/libbsp/a29k/Makefile.in
index 66ffa3505d..c4d99388cd 100644
--- a/c/src/lib/libbsp/a29k/Makefile.in
+++ b/c/src/lib/libbsp/a29k/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/a29k/portsw/Makefile.in b/c/src/lib/libbsp/a29k/portsw/Makefile.in
index dba0f67b3c..6da0888f3c 100644
--- a/c/src/lib/libbsp/a29k/portsw/Makefile.in
+++ b/c/src/lib/libbsp/a29k/portsw/Makefile.in
@@ -24,7 +24,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup console wrapup
+SUBDIRS = include start startup console wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/bare/Makefile.in b/c/src/lib/libbsp/bare/Makefile.in
index 78ed5ddc43..ca046cb705 100644
--- a/c/src/lib/libbsp/bare/Makefile.in
+++ b/c/src/lib/libbsp/bare/Makefile.in
@@ -24,7 +24,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include wrapup
+SUBDIRS = include wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/hppa1.1/Makefile.in b/c/src/lib/libbsp/hppa1.1/Makefile.in
index 05b38cb230..99ba6722d0 100644
--- a/c/src/lib/libbsp/hppa1.1/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
index fc9f095b60..129e440e3e 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
@@ -25,7 +25,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
 # NOTE: we pick up HPPA clock and timer from libcpu/hppa
-SUB_DIRS = tools include start startup tty $(MP_SUPPORT) wrapup
+SUBDIRS = tools include start startup tty $(MP_SUPPORT) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/Makefile.in b/c/src/lib/libbsp/i386/Makefile.in
index 8d7ade9599..cf53e44676 100644
--- a/c/src/lib/libbsp/i386/Makefile.in
+++ b/c/src/lib/libbsp/i386/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = shared $(RTEMS_BSP_FAMILY)
+SUBDIRS = shared $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.in b/c/src/lib/libbsp/i386/i386ex/Makefile.in
index 423b048e96..cfd0fff831 100644
--- a/c/src/lib/libbsp/i386/i386ex/Makefile.in
+++ b/c/src/lib/libbsp/i386/i386ex/Makefile.in
@@ -24,7 +24,7 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup clock console timer $(NETWORK) wrapup
+SUBDIRS = include start startup clock console timer $(NETWORK) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.in b/c/src/lib/libbsp/i386/pc386/Makefile.in
index b0ad405aa2..25ef9e138e 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.in
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.in
@@ -24,7 +24,7 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include tools start startup clock console timer $(NETWORK) wrapup
+SUBDIRS = include tools start startup clock console timer $(NETWORK) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/shared/Makefile.in b/c/src/lib/libbsp/i386/shared/Makefile.in
index f21430a2f9..888b54e2a8 100644
--- a/c/src/lib/libbsp/i386/shared/Makefile.in
+++ b/c/src/lib/libbsp/i386/shared/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = irq io comm pci
+SUBDIRS = irq io comm pci
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
index ed08872031..e6522ac857 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.in
@@ -24,7 +24,7 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include tools start startup clock console timer $(NETWORK) wrapup
+SUBDIRS = include tools start startup clock console timer $(NETWORK) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i960/Makefile.in b/c/src/lib/libbsp/i960/Makefile.in
index d6fa6af3f6..b0d83326ae 100644
--- a/c/src/lib/libbsp/i960/Makefile.in
+++ b/c/src/lib/libbsp/i960/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.in b/c/src/lib/libbsp/i960/cvme961/Makefile.in
index 864abba724..abbfc4a4f6 100644
--- a/c/src/lib/libbsp/i960/cvme961/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/Makefile.in
@@ -24,7 +24,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup clock console $(MP_SUPPORT) timer wrapup
+SUBDIRS = include start startup clock console $(MP_SUPPORT) timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/i960/rxgen960/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/Makefile.in
index f64e8862fe..354503763b 100644
--- a/c/src/lib/libbsp/i960/rxgen960/Makefile.in
+++ b/c/src/lib/libbsp/i960/rxgen960/Makefile.in
@@ -24,7 +24,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include startup clock console $(MP_SUPPORT) timer wrapup
+SUBDIRS = include startup clock console $(MP_SUPPORT) timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/m68k/Makefile.in b/c/src/lib/libbsp/m68k/Makefile.in
index ba6e1136b3..0c6de7ce9b 100644
--- a/c/src/lib/libbsp/m68k/Makefile.in
+++ b/c/src/lib/libbsp/m68k/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/Makefile.in
index ac339f6f85..b54d5043d2 100644
--- a/c/src/lib/libbsp/m68k/dmv152/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup clock console spurious timer wrapup
+SUBDIRS = include start startup clock console spurious timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.in b/c/src/lib/libbsp/m68k/idp/Makefile.in
index b652512eb5..2925a6b748 100644
--- a/c/src/lib/libbsp/m68k/idp/Makefile.in
+++ b/c/src/lib/libbsp/m68k/idp/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup clock console timer wrapup
+SUBDIRS = include start startup clock console timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/Makefile.in
index 01e32499f8..62544e9c52 100644
--- a/c/src/lib/libbsp/m68k/mvme136/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.in
@@ -24,7 +24,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup clock console $(MP_SUPPORT) timer wrapup
+SUBDIRS = include start startup clock console $(MP_SUPPORT) timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/Makefile.in
index 3090e868c6..be0e77c90a 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup clock console timer wrapup
+SUBDIRS = include start startup clock console timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in
index c1c83ecaba..8123253d9a 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in
@@ -24,7 +24,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup clock console timer $(MP_SUPPORT) wrapup
+SUBDIRS = include start startup clock console timer $(MP_SUPPORT) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/Makefile.in
index 6789357765..f6d39c301e 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.in
@@ -32,7 +32,7 @@ SRCS = README
 #  from the individual .rel files built in other directories
 #
 # XXXX add tools
-SUB_DIRS = include start startup clock console timer tod wrapup
+SUBDIRS = include start startup clock console timer tod wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/Makefile.in
index 1af57b3402..1a3b2e82d6 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.in
@@ -22,7 +22,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 #  from the individual .rel files built in other directories
 # include subdir must be first, otherwise the header files will not
 #  be installed when the other files are compiled.
-SUB_DIRS = include start startup clock console fatal timer wrapup
+SUBDIRS = include start startup clock console fatal timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/mips64orion/Makefile.in b/c/src/lib/libbsp/mips64orion/Makefile.in
index 72e2a0a50d..cf6974056e 100644
--- a/c/src/lib/libbsp/mips64orion/Makefile.in
+++ b/c/src/lib/libbsp/mips64orion/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/no_cpu/Makefile.in b/c/src/lib/libbsp/no_cpu/Makefile.in
index 5974c9b10d..1d43ff9c5f 100644
--- a/c/src/lib/libbsp/no_cpu/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in
index f6e4d0539c..b421bb5848 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in
@@ -28,7 +28,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include startup clock console $(MP_SUPPORT) timer wrapup
+SUBDIRS = include startup clock console $(MP_SUPPORT) timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/powerpc/Makefile.in b/c/src/lib/libbsp/powerpc/Makefile.in
index 820d4b70a6..25b0558fb0 100644
--- a/c/src/lib/libbsp/powerpc/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in
index ce25b30772..9297d39f94 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in
@@ -28,7 +28,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include clock console startup start timer scv64 tod \
+SUBDIRS = include clock console startup start timer scv64 tod \
     $(NETWORKING_DRIVER) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in
index 16bbb5a982..ad67de8883 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in
@@ -28,7 +28,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include startup start canbus console $(NETWORKING_DRIVER) wrapup
+SUBDIRS = include startup start canbus console $(NETWORKING_DRIVER) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.in b/c/src/lib/libbsp/powerpc/helas403/Makefile.in
index d0387aced0..9866c145a9 100644
--- a/c/src/lib/libbsp/powerpc/helas403/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.in
@@ -24,7 +24,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include dlentry flashentry startup wrapup
+SUBDIRS = include dlentry flashentry startup wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/powerpc/mcp750/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/Makefile.in
index 0e4a0923d5..4cd8161f04 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/Makefile.in
@@ -28,7 +28,7 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = clock console include pci residual openpic irq vectors \
+SUBDIRS = clock console include pci residual openpic irq vectors \
     start startup bootloader $(NETWORK) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in
index 0e4a0923d5..4cd8161f04 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in
@@ -28,7 +28,7 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = clock console include pci residual openpic irq vectors \
+SUBDIRS = clock console include pci residual openpic irq vectors \
     start startup bootloader $(NETWORK) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libbsp/powerpc/mvme2307/Makefile.in b/c/src/lib/libbsp/powerpc/mvme2307/Makefile.in
index 3241e1acce..d9fb6223b5 100644
--- a/c/src/lib/libbsp/powerpc/mvme2307/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mvme2307/Makefile.in
@@ -28,7 +28,7 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS=include clock console startup boot \
+SUBDIRS=include clock console startup boot \
     nvram timer pci $(NETWORK) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libbsp/powerpc/papyrus/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/Makefile.in
index 06d063a575..c76b1658da 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/Makefile.in
@@ -24,7 +24,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include dlentry flashentry startup wrapup
+SUBDIRS = include dlentry flashentry startup wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in
index e2c5274bcd..570c1b0386 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in
@@ -28,7 +28,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include clock console startup start timer tod $(NETWORK_DRIVER) \
+SUBDIRS = include clock console startup start timer tod $(NETWORK_DRIVER) \
     universe pci nvram vectors wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/Makefile.in
index 861c6003f2..49e9ace7d7 100644
--- a/c/src/lib/libbsp/powerpc/score603e/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.in
@@ -24,7 +24,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include clock console startup start timer tod PCI_bus vectors \
+SUBDIRS = include clock console startup start timer tod PCI_bus vectors \
     wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libbsp/sh/Makefile.in b/c/src/lib/libbsp/sh/Makefile.in
index 773b8f0a6a..37eab8e0a6 100644
--- a/c/src/lib/libbsp/sh/Makefile.in
+++ b/c/src/lib/libbsp/sh/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.in b/c/src/lib/libbsp/sh/gensh1/Makefile.in
index c495ae5306..b95d0b35c9 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup scitab console wrapup
+SUBDIRS = include start startup scitab console wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.in b/c/src/lib/libbsp/sh/gensh2/Makefile.in
index 6162ab1d6b..ae9f203b14 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 ## wrapup is the one that actually builds and installs the library
 ##  from the individual .rel files built in other directories
-SUB_DIRS = include start startup scitab console wrapup
+SUBDIRS = include start startup scitab console wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/sparc/Makefile.in b/c/src/lib/libbsp/sparc/Makefile.in
index d79fdea891..bee331e43f 100644
--- a/c/src/lib/libbsp/sparc/Makefile.in
+++ b/c/src/lib/libbsp/sparc/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/unix/Makefile.in b/c/src/lib/libbsp/unix/Makefile.in
index 36c6f1b976..da6d4b93d8 100644
--- a/c/src/lib/libbsp/unix/Makefile.in
+++ b/c/src/lib/libbsp/unix/Makefile.in
@@ -19,7 +19,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
-SUB_DIRS = $(RTEMS_BSP_FAMILY)
+SUBDIRS = $(RTEMS_BSP_FAMILY)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/unix/posix/Makefile.in b/c/src/lib/libbsp/unix/posix/Makefile.in
index 23f7568a2b..fa4a559df9 100644
--- a/c/src/lib/libbsp/unix/posix/Makefile.in
+++ b/c/src/lib/libbsp/unix/posix/Makefile.in
@@ -28,7 +28,7 @@ all: $(SRCS)
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include startup clock console timer $(MP_SUPPORT) wrapup tools
+SUBDIRS = include startup clock console timer $(MP_SUPPORT) wrapup tools
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/Makefile.in b/c/src/lib/libcpu/Makefile.in
index 4135a868b7..d527af8dc8 100644
--- a/c/src/lib/libcpu/Makefile.in
+++ b/c/src/lib/libcpu/Makefile.in
@@ -17,7 +17,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = $(wildcard $(RTEMS_CPU))
+SUBDIRS = $(wildcard $(RTEMS_CPU))
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/hppa1.1/Makefile.in b/c/src/lib/libcpu/hppa1.1/Makefile.in
index eb644522f5..8b73347802 100644
--- a/c/src/lib/libcpu/hppa1.1/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = include milli clock timer semaphore
+SUBDIRS = include milli clock timer semaphore
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/m68k/Makefile.in b/c/src/lib/libcpu/m68k/Makefile.in
index 4285a7aac4..ecde9c968a 100644
--- a/c/src/lib/libcpu/m68k/Makefile.in
+++ b/c/src/lib/libcpu/m68k/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = $(wildcard $(RTEMS_CPU_MODEL))
+SUBDIRS = $(wildcard $(RTEMS_CPU_MODEL))
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/m68k/m68040/Makefile.in b/c/src/lib/libcpu/m68k/m68040/Makefile.in
index 8dc72bda00..de08bfc38b 100644
--- a/c/src/lib/libcpu/m68k/m68040/Makefile.in
+++ b/c/src/lib/libcpu/m68k/m68040/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = fpsp
+SUBDIRS = fpsp
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/mips64orion/Makefile.in b/c/src/lib/libcpu/mips64orion/Makefile.in
index 5bf03d9e16..1d1d660d04 100644
--- a/c/src/lib/libcpu/mips64orion/Makefile.in
+++ b/c/src/lib/libcpu/mips64orion/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = include clock timer
+SUBDIRS = include clock timer
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/powerpc/Makefile.in b/c/src/lib/libcpu/powerpc/Makefile.in
index 6535e4d110..c1df8aea49 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/Makefile.in
@@ -22,7 +22,7 @@ ifeq ($(wildcard $(RTEMS_CPU_MODEL)),$(RTEMS_CPU_MODEL))
 SHARED_LIB = shared
 endif 
 
-SUB_DIRS =  $(SHARED_LIB) $(wildcard $(RTEMS_CPU_MODEL)) wrapup
+SUBDIRS =  $(SHARED_LIB) $(wildcard $(RTEMS_CPU_MODEL)) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/powerpc/mpc505/Makefile.in b/c/src/lib/libcpu/powerpc/mpc505/Makefile.in
index 4184042b59..476b8c069b 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc505/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = vectors timer wrapup
+SUBDIRS = vectors timer wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/powerpc/mpc750/Makefile.in b/c/src/lib/libcpu/powerpc/mpc750/Makefile.in
index 499a88ce34..f0775991fc 100644
--- a/c/src/lib/libcpu/powerpc/mpc750/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc750/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = exceptions mmu clock wrapup
+SUBDIRS = exceptions mmu clock wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/powerpc/mpc821/Makefile.in b/c/src/lib/libcpu/powerpc/mpc821/Makefile.in
index 6d150607c6..d1d021704f 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc821/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = include console-generic clock timer vectors
+SUBDIRS = include console-generic clock timer vectors
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/powerpc/mpc860/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/Makefile.in
index 73e5969bca..84cb046849 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = include console-generic clock timer vectors
+SUBDIRS = include console-generic clock timer vectors
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/Makefile.in
index 50d7bf55f4..eb7b4f529b 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = include console clock timer vectors ictrl
+SUBDIRS = include console clock timer vectors ictrl
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/sh/Makefile.in b/c/src/lib/libcpu/sh/Makefile.in
index a331d64ac1..896972d6c1 100644
--- a/c/src/lib/libcpu/sh/Makefile.in
+++ b/c/src/lib/libcpu/sh/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = $(wildcard $(RTEMS_CPU_MODEL))
+SUBDIRS = $(wildcard $(RTEMS_CPU_MODEL))
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.in b/c/src/lib/libcpu/sh/sh7032/Makefile.in
index 34e6494f8b..d9daeceb66 100644
--- a/c/src/lib/libcpu/sh/sh7032/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = include clock timer null sci delay
+SUBDIRS = include clock timer null sci delay
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.in b/c/src/lib/libcpu/sh/sh7045/Makefile.in
index 411ccb9f7e..b99c954d00 100644
--- a/c/src/lib/libcpu/sh/sh7045/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7045/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = include clock sci timer null
+SUBDIRS = include clock sci timer null
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/sparc/Makefile.in b/c/src/lib/libcpu/sparc/Makefile.in
index b87538e15e..87b946d064 100644
--- a/c/src/lib/libcpu/sparc/Makefile.in
+++ b/c/src/lib/libcpu/sparc/Makefile.in
@@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-SUB_DIRS = reg_win syscall
+SUBDIRS = reg_win syscall
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am
new file mode 100644
index 0000000000..52f13482da
--- /dev/null
+++ b/c/src/libchip/network/Makefile.am
@@ -0,0 +1,56 @@
+#
+# $Id$
+#
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libnetchip
+LIB = ${ARCH}/${LIBNAME}.a
+
+C_FILES = sonic.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = sonic.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
+
+$(PROJECT_INCLUDE)/libchip:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/libchip/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
+AM_CFLAGS += $(LIBC_DEFINES)
+
+if HAS_NETWORKING
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/libchip \
+$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
+
+TMPINSTALL_FILES = \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+
+$(LIB): $(SRCS) ${OBJS}
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+endif
+
+EXTRA_DIST = README README.sonic
+EXTRA_DIST += $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libchip/network/Makefile.in b/c/src/libchip/network/Makefile.in
deleted file mode 100644
index d6ae6e9bcc..0000000000
--- a/c/src/libchip/network/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = network
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIBNAME = libnetchip.a
-LIB = ${ARCH}/${LIBNAME}
-
-C_PIECES = sonic
-
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-INSTALLED_H_FILES = $(srcdir)/sonic.h
-SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) \
-    $(PRIVATE_H_FILES)
-OBJS = $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/libchip
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-CPPFLAGS +=
-CFLAGS += $(LIBC_DEFINES)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all: @HAS_NETWORKING_TRUE@${ARCH} preinstall $(LIB)
-@HAS_NETWORKING_TRUE@	$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
-
-$(LIB): @HAS_NETWORKING_TRUE@$(SRCS) ${OBJS}
-@HAS_NETWORKING_TRUE@	$(make-library)
-
-# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-preinstall: 
-@HAS_NETWORKING_TRUE@	$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
-@HAS_NETWORKING_TRUE@	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
-
-EXTRA_DIST = README README.sonic
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am
new file mode 100644
index 0000000000..4c5b210624
--- /dev/null
+++ b/c/src/libchip/rtc/Makefile.am
@@ -0,0 +1,55 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = librtcio
+LIB = ${ARCH}/${LIBNAME}.a
+
+C_FILES = rtcprobe.c icm7170.c icm7170_reg.c icm7170_reg2.c icm7170_reg4.c \
+    icm7170_reg8.c m48t08.c m48t08_reg.c m48t08_reg2.c m48t08_reg4.c m48t08_reg8.c
+
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = rtc.h icm7170.h m48t08.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)/libchip \
+$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
+
+TMPINSTALL_FILES = \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+
+$(PROJECT_INCLUDE)/libchip:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/libchip/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# Add local stuff here using +=
+#
+
+AM_CFLAGS += $(LIBC_DEFINES)
+
+$(LIB): $(SRCS) ${OBJS}
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+DOC_FILES = \
+README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS
+
+EXTRA_DIST += $(C_FILES) $(DOC_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libchip/rtc/Makefile.in b/c/src/libchip/rtc/Makefile.in
deleted file mode 100644
index 8039ef32d6..0000000000
--- a/c/src/libchip/rtc/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = rtc
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIBNAME = librtcio.a
-LIB = ${ARCH}/${LIBNAME}
-
-C_PIECES = rtcprobe icm7170 icm7170_reg icm7170_reg2 icm7170_reg4 \
-    icm7170_reg8 m48t08 m48t08_reg m48t08_reg2 m48t08_reg4 m48t08_reg8
-
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-INSTALLED_H_FILES = $(srcdir)/rtc.h $(srcdir)/icm7170.h $(srcdir)/m48t08.h
-
-SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) \
-    $(PRIVATE_H_FILES)
-OBJS = $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/libchip
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(LIBC_DEFINES)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} preinstall $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-preinstall: 
-	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
-	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am
new file mode 100644
index 0000000000..2f4a16f697
--- /dev/null
+++ b/c/src/libchip/serial/Makefile.am
@@ -0,0 +1,56 @@
+#
+#  $Id$
+#
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libserialio
+LIB = ${ARCH}/${LIBNAME}.a
+
+C_FILES = mc68681.c mc68681_baud.c mc68681_reg.c mc68681_reg2.c \
+    mc68681_reg4.c mc68681_reg8.c ns16550.c z85c30.c z85c30_reg.c \
+    serprobe.c termios_baud2index.c termios_baud2num.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = mc68681_p.h ns16550_p.h sersupp.h z85c30_p.h
+INSTALLED_H_FILES = mc68681.h ns16550.h z85c30.h serial.h
+noinst_HEADERS = $(H_FILES) $(INSTALLED_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)/libchip \
+$(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libchip/%)
+
+TMPINSTALL_FILES = \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+
+$(PROJECT_INCLUDE)/libchip:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/libchip/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+#
+# Add local stuff here using +=
+#
+
+AM_CFLAGS += $(LIBC_DEFINES)
+
+$(LIB): $(SRCS) ${OBJS}
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+DOC_FILES = \
+README.mc68681 README.ns16550 README.xr88681 README.z85c30 STATUS
+
+EXTRA_DIST += $(C_FILES) $(DOC_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libchip/serial/Makefile.in b/c/src/libchip/serial/Makefile.in
deleted file mode 100644
index ee1d4cede6..0000000000
--- a/c/src/libchip/serial/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = serial
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIBNAME = libserialio.a
-LIB = ${ARCH}/${LIBNAME}
-
-C_PIECES = mc68681 mc68681_baud mc68681_reg mc68681_reg2 mc68681_reg4 \
-    mc68681_reg8 ns16550 z85c30 z85c30_reg serprobe termios_baud2index \
-    termios_baud2num
-
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-INSTALLED_H_FILES = $(srcdir)/mc68681.h $(srcdir)/ns16550.h \
-    $(srcdir)/z85c30.h $(srcdir)/serial.h
-SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) \
-    $(PRIVATE_H_FILES)
-OBJS = $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/libchip
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(LIBC_DEFINES)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} preinstall $(LIB)
-	@$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-preinstall: 
-	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
-	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libmisc/configure.in b/c/src/libmisc/configure.in
index c429667cb4..a1c35f5536 100644
--- a/c/src/libmisc/configure.in
+++ b/c/src/libmisc/configure.in
@@ -13,7 +13,6 @@ AM_INIT_AUTOMAKE(rtems-c-src-libmisc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_MULTIPROCESSING
-RTEMS_ENABLE_NETWORKING
 RTEMS_ENABLE_LIBCDIR
 RTEMS_ENABLE_BARE
 
@@ -31,6 +30,8 @@ RTEMS_CANONICALIZE_TOOLS
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
 # Try to explicitly list a Makefile here 
 AC_OUTPUT(
 Makefile
diff --git a/c/src/libmisc/cpuuse/Makefile.am b/c/src/libmisc/cpuuse/Makefile.am
new file mode 100644
index 0000000000..45b4f8b88e
--- /dev/null
+++ b/c/src/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/c/src/libmisc/cpuuse/Makefile.in b/c/src/libmisc/cpuuse/Makefile.in
deleted file mode 100644
index 0fcfdfe599..0000000000
--- a/c/src/libmisc/cpuuse/Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = cpuuse
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIB = ${ARCH}/libcpuuse-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpuuse
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-INSTALLED_H_FILES = $(srcdir)/cpuuse.h
-
-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
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I.
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} preinstall ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) preinstall $(LIB)
-
-preinstall: 
-	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libmisc/dummy/Makefile.am b/c/src/libmisc/dummy/Makefile.am
new file mode 100644
index 0000000000..296cdc48c6
--- /dev/null
+++ b/c/src/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/c/src/libmisc/dummy/Makefile.in b/c/src/libmisc/dummy/Makefile.in
deleted file mode 100644
index d55edbeae8..0000000000
--- a/c/src/libmisc/dummy/Makefile.in
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = dummy
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-PGM = ${ARCH}/dummy.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = dummy
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${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
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I.
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
-
-all: ${ARCH} $(SRCS) $(PGM)
-	$(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/lib
-
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libmisc/dumpbuf/Makefile.am b/c/src/libmisc/dumpbuf/Makefile.am
new file mode 100644
index 0000000000..01e3225ec7
--- /dev/null
+++ b/c/src/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/c/src/libmisc/dumpbuf/Makefile.in b/c/src/libmisc/dumpbuf/Makefile.in
deleted file mode 100644
index fae42333b3..0000000000
--- a/c/src/libmisc/dumpbuf/Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = dumpbuf
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIB = ${ARCH}/libdumpbuf-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = dumpbuf
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-INSTALLED_H_FILES = $(srcdir)/dumpbuf.h
-
-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
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I.
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} preinstall ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) preinstall $(LIB)
-
-preinstall: 
-	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libmisc/monitor/Makefile.am b/c/src/libmisc/monitor/Makefile.am
new file mode 100644
index 0000000000..c1567ef917
--- /dev/null
+++ b/c/src/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/c/src/libmisc/monitor/Makefile.in b/c/src/libmisc/monitor/Makefile.in
deleted file mode 100644
index 5804504388..0000000000
--- a/c/src/libmisc/monitor/Makefile.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = monitor
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-LIB = ${ARCH}/libmonitor-tmp.a
-
-# C source names, if any, go here -- minus the .c
-# We only build multiprocessing related files if HAS_MP was defined
-MP_C_PIECES_yes_V = mon-mpci
-MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
-
-C_PIECES = mon-command mon-symbols mon-prmisc mon-monitor mon-object \
-    mon-server mon-task mon-queue mon-driver mon-dname mon-itask \
-    mon-extension mon-manager mon-config $(MP_C_PIECES)
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-INSTALLED_H_FILES = $(srcdir)/monitor.h $(srcdir)/symbols.h
-
-SRCS = README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS = $(C_O_FILES)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-.PHONY: preinstall
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} ${OBJS}
-	$(make-library)
-
-all: preinstall ${ARCH} $(SRCS) $(LIB)
-
-preinstall: $(INSTALLED_H_FILES)
-	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libmisc/rtmonuse/Makefile.am b/c/src/libmisc/rtmonuse/Makefile.am
new file mode 100644
index 0000000000..4d2db38b27
--- /dev/null
+++ b/c/src/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/c/src/libmisc/rtmonuse/Makefile.in b/c/src/libmisc/rtmonuse/Makefile.in
deleted file mode 100644
index dcc2ba510f..0000000000
--- a/c/src/libmisc/rtmonuse/Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = rtmonuse
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIB = ${ARCH}/librtmonuse-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = rtmonuse
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-INSTALLED_H_FILES = $(srcdir)/rtmonuse.h
-
-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
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I.
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} preinstall ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) preinstall $(LIB)
-
-preinstall: 
-	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libmisc/stackchk/Makefile.am b/c/src/libmisc/stackchk/Makefile.am
new file mode 100644
index 0000000000..4430ffae32
--- /dev/null
+++ b/c/src/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/c/src/libmisc/stackchk/Makefile.in b/c/src/libmisc/stackchk/Makefile.in
deleted file mode 100644
index 80d72807d9..0000000000
--- a/c/src/libmisc/stackchk/Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = stackchk
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIB = ${ARCH}/libstackchk-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = check
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES = internal.h
-INSTALLED_H_FILES = $(srcdir)/stackchk.h
-
-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
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} preinstall ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) $(LIB)
-
-preinstall: 
-	 @$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libmisc/untar/Makefile.am b/c/src/libmisc/untar/Makefile.am
new file mode 100644
index 0000000000..2219fec095
--- /dev/null
+++ b/c/src/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/c/src/libmisc/untar/Makefile.in b/c/src/libmisc/untar/Makefile.in
deleted file mode 100644
index 1a201a34ac..0000000000
--- a/c/src/libmisc/untar/Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = untar
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIB = ${ARCH}/libuntar-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = untar
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES = $(srcdir)/untar.h
-
-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
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I.
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) $(LIB)
-	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/libmisc/wrapup/Makefile.am b/c/src/libmisc/wrapup/Makefile.am
new file mode 100644
index 0000000000..f5a62744f0
--- /dev/null
+++ b/c/src/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/c/src/libmisc/wrapup/Makefile.in b/c/src/libmisc/wrapup/Makefile.in
deleted file mode 100644
index b81fa4f653..0000000000
--- a/c/src/libmisc/wrapup/Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = wrapup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIB = $(ARCH)/libmisc.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#  Using the wildcard on the Purify support makes sure it may not be there
-
-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
-
-RELS =
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${LIBS} $(RELS)
-	$(RM) -r $(ARCH)
-	mkdir $(ARCH)
-	cd $(ARCH); for lib in $(LIBS:%=../%); do \
-                         $(AR) -xv $$lib; \
-                    done
-	$(RM) $@
-	$(AR) ruv $@ $(ARCH)/*
-	$(RANLIB) $@
-
-all: ${ARCH} $(SRCS) $(LIB)
-	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/librdbg/include/rdbg/Makefile.am b/c/src/librdbg/include/rdbg/Makefile.am
index 241633d9be..d47897ff43 100644
--- a/c/src/librdbg/include/rdbg/Makefile.am
+++ b/c/src/librdbg/include/rdbg/Makefile.am
@@ -5,11 +5,11 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 if HAS_RDBG
-H_PIECES = rdbg.h servrpc.h
+H_FILES = rdbg.h servrpc.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rdbg \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
 
@@ -19,9 +19,9 @@ $(PROJECT_INCLUDE)/rdbg/%.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)
 
 if HAS_RDBG
 SUBDIRS = $(RTEMS_CPU)
diff --git a/c/src/librdbg/include/rdbg/i386/Makefile.am b/c/src/librdbg/include/rdbg/i386/Makefile.am
index 8b768f4f49..22246c94ec 100644
--- a/c/src/librdbg/include/rdbg/i386/Makefile.am
+++ b/c/src/librdbg/include/rdbg/i386/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = rdbg_f.h reg.h
+H_FILES = rdbg_f.h reg.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-##TMPINSTALL_FILES = \
+##PREINSTALL_FILES = \
 ##$(PROJECT_INCLUDE)/rdbg/i386 \
 ##$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/i386/%)
 
@@ -17,7 +17,7 @@ noinst_HEADERS = $(H_PIECES)
 ##$(PROJECT_INCLUDE)/rdbg/i386/%.h: %.h
 ##	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rdbg \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
 
@@ -26,8 +26,8 @@ $(PROJECT_INCLUDE)/rdbg:
 $(PROJECT_INCLUDE)/rdbg/%.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)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/librdbg/include/rdbg/powerpc/Makefile.am b/c/src/librdbg/include/rdbg/powerpc/Makefile.am
index aed4cc5454..b5b502bf3b 100644
--- a/c/src/librdbg/include/rdbg/powerpc/Makefile.am
+++ b/c/src/librdbg/include/rdbg/powerpc/Makefile.am
@@ -4,11 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = rdbg_f.h reg.h
+H_FILES = rdbg_f.h reg.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-##TMPINSTALL_FILES = \
+##PREINSTALL_FILES = \
 ##$(PROJECT_INCLUDE)/rdbg/powerpc \
 ##$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/powerpc/%)
 
@@ -17,7 +17,7 @@ noinst_HEADERS = $(H_PIECES)
 ##$(PROJECT_INCLUDE)/rdbg/powerpc/%.h: %.h
 ##	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rdbg \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
 
@@ -26,8 +26,8 @@ $(PROJECT_INCLUDE)/rdbg:
 $(PROJECT_INCLUDE)/rdbg/%.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)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/librpc/include/rpc/Makefile.am b/c/src/librpc/include/rpc/Makefile.am
index a4753a7ba5..49b4706d1e 100644
--- a/c/src/librpc/include/rpc/Makefile.am
+++ b/c/src/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/c/src/librtems++/include/rtems++/Makefile.am b/c/src/librtems++/include/rtems++/Makefile.am
index 02179fc3fc..67ace61e70 100644
--- a/c/src/librtems++/include/rtems++/Makefile.am
+++ b/c/src/librtems++/include/rtems++/Makefile.am
@@ -5,12 +5,12 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 if HAS_CXX
-H_PIECES = rtemsEvent.h rtemsInterrupt.h rtemsMessageQueue.h \
+H_FILES = rtemsEvent.h rtemsInterrupt.h rtemsMessageQueue.h \
     rtemsSemaphore.h rtemsStatusCode.h rtemsTask.h rtemsTaskMode.h rtemsTimer.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rtems++ \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems++/%)
 
@@ -20,8 +20,8 @@ $(PROJECT_INCLUDE)/rtems++/%.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