10 files changed, 266 insertions, 212 deletions
diff --git a/c/src/lib/libmisc/Makefile.in b/c/src/lib/libmisc/Makefile.in
index 06657f0e35..967f2b7c1e 100644
--- a/c/src/lib/libmisc/Makefile.in
+++ b/c/src/lib/libmisc/Makefile.in
@@ -5,21 +5,30 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = c/src/lib/libmisc
+top_builddir = ..
+subdir = libmisc
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=assoc dumpbuf error stackchk monitor cpuuse rtmonuse untar wrapup
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
+SUB_DIRS = assoc dumpbuf error stackchk monitor cpuuse rtmonuse untar wrapup
+
+preinstall: 
+	$(mkinstalldirs) $(INSTALLDIRS)
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/assoc/Makefile.in b/c/src/lib/libmisc/assoc/Makefile.in
index 2374e720eb..5470d0c646 100644
--- a/c/src/lib/libmisc/assoc/Makefile.in
+++ b/c/src/lib/libmisc/assoc/Makefile.in
@@ -1,46 +1,52 @@
-#	
+#
 #  $Id$
 #
 
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/assoc
-
-INSTALL = @INSTALL@
+top_builddir = ../..
+subdir = libmisc/assoc
 
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=${ARCH}/libassoc-tmp.a
+LIB = ${ARCH}/libassoc-tmp.a
 
 # C source names, if any, go here -- minus the .c
-C_PIECES=assoc assocnamebad
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
+C_PIECES = assoc assocnamebad
+C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES=$(srcdir)/assoc.h
+H_FILES = $(srcdir)/assoc.h
 
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_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/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  +=
+DEFINES +=
 CPPFLAGS += -I.
-CFLAGS   +=
+CFLAGS +=
 
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -55,9 +61,9 @@ CLOBBER_ADDITIONS +=
 ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
+all: ${ARCH} $(SRCS) $(LIB)
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/cpuuse/Makefile.in b/c/src/lib/libmisc/cpuuse/Makefile.in
index 4f4b41bdb3..8e0aeb8b1b 100644
--- a/c/src/lib/libmisc/cpuuse/Makefile.in
+++ b/c/src/lib/libmisc/cpuuse/Makefile.in
@@ -1,47 +1,53 @@
-#	
+#
 #  $Id$
 #
 
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/cpuuse
-
-INSTALL = @INSTALL@
+top_builddir = ../..
+subdir = libmisc/cpuuse
 
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=${ARCH}/libcpuuse-tmp.a
+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)
+C_PIECES = cpuuse
+C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES=
-INSTALLED_H_FILES=$(srcdir)/cpuuse.h
+H_FILES =
+INSTALLED_H_FILES = $(srcdir)/cpuuse.h
 
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_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/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  +=
+DEFINES +=
 CPPFLAGS += -I.
-CFLAGS   +=
+CFLAGS +=
 
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -58,9 +64,9 @@ ${LIB}: ${SRCS} preinstall ${OBJS}
 
 all: ${ARCH} $(SRCS) preinstall $(LIB)
 
-preinstall:
-	$(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
+preinstall: 
+	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/dumpbuf/Makefile.in b/c/src/lib/libmisc/dumpbuf/Makefile.in
index 2d48d9ce44..b794ae9cc6 100644
--- a/c/src/lib/libmisc/dumpbuf/Makefile.in
+++ b/c/src/lib/libmisc/dumpbuf/Makefile.in
@@ -1,47 +1,53 @@
-#	
+#
 #  $Id$
 #
 
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/dumpbuf
-
-INSTALL = @INSTALL@
+top_builddir = ../..
+subdir = libmisc/dumpbuf
 
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=${ARCH}/libdumpbuf-tmp.a
+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)
+C_PIECES = dumpbuf
+C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES=
-INSTALLED_H_FILES=$(srcdir)/dumpbuf.h
+H_FILES =
+INSTALLED_H_FILES = $(srcdir)/dumpbuf.h
 
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_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/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  +=
+DEFINES +=
 CPPFLAGS += -I.
-CFLAGS   +=
+CFLAGS +=
 
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -58,9 +64,9 @@ ${LIB}: ${SRCS} preinstall ${OBJS}
 
 all: ${ARCH} $(SRCS) preinstall $(LIB)
 
-preinstall:
-	$(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
+preinstall: 
+	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/error/Makefile.in b/c/src/lib/libmisc/error/Makefile.in
index bd1154f752..51f283577c 100644
--- a/c/src/lib/libmisc/error/Makefile.in
+++ b/c/src/lib/libmisc/error/Makefile.in
@@ -1,46 +1,52 @@
-#	
+#
 #  $Id$
 #
 
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/error
-
-INSTALL = @INSTALL@
+top_builddir = ../..
+subdir = libmisc/error
 
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=${ARCH}/liberror-tmp.a
+LIB = ${ARCH}/liberror-tmp.a
 
 # C source names, if any, go here -- minus the .c
-C_PIECES=error
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
+C_PIECES = error
+C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES=$(srcdir)/error.h
+H_FILES = $(srcdir)/error.h
 
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_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/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  +=
+DEFINES +=
 CPPFLAGS += -I.
-CFLAGS   +=
+CFLAGS +=
 
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -55,9 +61,9 @@ CLOBBER_ADDITIONS +=
 ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
+all: ${ARCH} $(SRCS) $(LIB)
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/monitor/Makefile.in b/c/src/lib/libmisc/monitor/Makefile.in
index e307104425..b74eb343d1 100644
--- a/c/src/lib/libmisc/monitor/Makefile.in
+++ b/c/src/lib/libmisc/monitor/Makefile.in
@@ -5,49 +5,55 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/monitor
+top_builddir = ../..
+subdir = libmisc/monitor
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=${ARCH}/libmonitor-tmp.a
+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_PIECES_yes_V = mon-mpci
-MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
+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_PIECES)
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
+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
+H_FILES =
+INSTALLED_H_FILES = $(srcdir)/monitor.h $(srcdir)/symbols.h
 
-SRCS=README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_FILES)
+SRCS = README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
+OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+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  +=
+DEFINES +=
 CPPFLAGS += -I$(srcdir)
-CFLAGS   +=
+CFLAGS +=
 
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -64,11 +70,11 @@ CLOBBER_ADDITIONS +=
 ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
-all:	preinstall ${ARCH} $(SRCS) $(LIB)
+all: preinstall ${ARCH} $(SRCS) $(LIB)
 
 preinstall: $(INSTALLED_H_FILES)
-	$(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
+	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/rtmonuse/Makefile.in b/c/src/lib/libmisc/rtmonuse/Makefile.in
index 32901897da..9638113622 100644
--- a/c/src/lib/libmisc/rtmonuse/Makefile.in
+++ b/c/src/lib/libmisc/rtmonuse/Makefile.in
@@ -1,47 +1,53 @@
-#	
+#
 #  $Id$
 #
 
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/rtmonuse
-
-INSTALL = @INSTALL@
+top_builddir = ../..
+subdir = libmisc/rtmonuse
 
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=${ARCH}/librtmonuse-tmp.a
+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)
+C_PIECES = rtmonuse
+C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES=
-INSTALLED_H_FILES=$(srcdir)/rtmonuse.h
+H_FILES =
+INSTALLED_H_FILES = $(srcdir)/rtmonuse.h
 
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_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/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  +=
+DEFINES +=
 CPPFLAGS += -I.
-CFLAGS   +=
+CFLAGS +=
 
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -58,9 +64,9 @@ ${LIB}: ${SRCS} preinstall ${OBJS}
 
 all: ${ARCH} $(SRCS) preinstall $(LIB)
 
-preinstall:
-	$(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
+preinstall: 
+	@$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/stackchk/Makefile.in b/c/src/lib/libmisc/stackchk/Makefile.in
index 976b323104..caa322038f 100644
--- a/c/src/lib/libmisc/stackchk/Makefile.in
+++ b/c/src/lib/libmisc/stackchk/Makefile.in
@@ -5,43 +5,49 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/stackchk
+top_builddir = ../..
+subdir = libmisc/stackchk
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=${ARCH}/libstackchk-tmp.a
+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)
+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
+H_FILES = internal.h
+INSTALLED_H_FILES = $(srcdir)/stackchk.h
 
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_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/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  +=
+DEFINES +=
 CPPFLAGS +=
-CFLAGS   +=
+CFLAGS +=
 
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -56,11 +62,11 @@ CLOBBER_ADDITIONS +=
 ${LIB}: ${SRCS} preinstall ${OBJS}
 	$(make-library)
 
-all:	${ARCH} $(SRCS) $(LIB)
+all: ${ARCH} $(SRCS) $(LIB)
 
-preinstall:
-	 $(INSTALL_CHANGE) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
+preinstall: 
+	 @$(INSTALL_CHANGE) -m 644 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/untar/Makefile.in b/c/src/lib/libmisc/untar/Makefile.in
index e0c44226a1..856a505c6b 100644
--- a/c/src/lib/libmisc/untar/Makefile.in
+++ b/c/src/lib/libmisc/untar/Makefile.in
@@ -1,46 +1,52 @@
-#	
+#
 #  $Id$
 #
 
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/untar
-
-INSTALL = @INSTALL@
+top_builddir = ../..
+subdir = libmisc/untar
 
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=${ARCH}/libuntar-tmp.a
+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)
+C_PIECES = untar
+C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES=$(srcdir)/untar.h
+H_FILES = $(srcdir)/untar.h
 
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_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/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  +=
+DEFINES +=
 CPPFLAGS += -I.
-CFLAGS   +=
+CFLAGS +=
 
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
+LD_PATHS +=
+LD_LIBS +=
+LDFLAGS +=
 
 #
 # Add your list of files to delete here.  The config files
@@ -55,9 +61,9 @@ CLOBBER_ADDITIONS +=
 ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
+all: ${ARCH} $(SRCS) $(LIB)
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libmisc/wrapup/Makefile.in b/c/src/lib/libmisc/wrapup/Makefile.in
index b20dee5a34..83d3197204 100644
--- a/c/src/lib/libmisc/wrapup/Makefile.in
+++ b/c/src/lib/libmisc/wrapup/Makefile.in
@@ -5,33 +5,30 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/lib/libmisc/wrapup
+top_builddir = ../..
+subdir = libmisc/wrapup
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-LIB=$(ARCH)/libmisc.a
+LIB = $(ARCH)/libmisc.a
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+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 \
-     ../error/$(ARCH)/liberror-tmp.a \
-     ../assoc/$(ARCH)/libassoc-tmp.a \
-     ../stackchk/$(ARCH)/libstackchk-tmp.a \
-     ../cpuuse/$(ARCH)/libcpuuse-tmp.a \
-     ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
-     ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a
+LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a ../untar/$(ARCH)/libuntar-tmp.a \
+    ../error/$(ARCH)/liberror-tmp.a ../assoc/$(ARCH)/libassoc-tmp.a \
+    ../stackchk/$(ARCH)/libstackchk-tmp.a ../cpuuse/$(ARCH)/libcpuuse-tmp.a \
+    ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
+    ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a
 
-RELS=
+RELS =
 
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
@@ -44,11 +41,11 @@ $(LIB): ${LIBS} $(RELS)
                     done
 	$(RM) $@
 	$(AR) ruv $@ $(ARCH)/*
-	$(MKLIB) $@
+	$(RANLIB) $@
 
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib
+all: ${ARCH} $(SRCS) $(LIB)
+	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status