summaryrefslogtreecommitdiffstats
path: root/c/src/libmisc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-22 13:41:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-22 13:41:11 +0000
commit9608320702e8dba9947987cd34001824638c434e (patch)
tree4352f820543cb2755ff8d6cfa2d9a0e7d0fc7544 /c/src/libmisc
parent75f2b0b0ef652dfefda489330c09a00601b7c203 (diff)
downloadrtems-9608320702e8dba9947987cd34001824638c434e.tar.bz2
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.
Diffstat (limited to 'c/src/libmisc')
-rw-r--r--c/src/libmisc/configure.in3
-rw-r--r--c/src/libmisc/cpuuse/Makefile.am42
-rw-r--r--c/src/libmisc/cpuuse/Makefile.in72
-rw-r--r--c/src/libmisc/dummy/Makefile.am43
-rw-r--r--c/src/libmisc/dummy/Makefile.in70
-rw-r--r--c/src/libmisc/dumpbuf/Makefile.am43
-rw-r--r--c/src/libmisc/dumpbuf/Makefile.in72
-rw-r--r--c/src/libmisc/monitor/Makefile.am53
-rw-r--r--c/src/libmisc/monitor/Makefile.in80
-rw-r--r--c/src/libmisc/rtmonuse/Makefile.am42
-rw-r--r--c/src/libmisc/rtmonuse/Makefile.in72
-rw-r--r--c/src/libmisc/stackchk/Makefile.am43
-rw-r--r--c/src/libmisc/stackchk/Makefile.in72
-rw-r--r--c/src/libmisc/untar/Makefile.am42
-rw-r--r--c/src/libmisc/untar/Makefile.in69
-rw-r--r--c/src/libmisc/wrapup/Makefile.am43
-rw-r--r--c/src/libmisc/wrapup/Makefile.in50
17 files changed, 353 insertions, 558 deletions
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