Patches rtems-rc-20000204-0.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that contains: * Removes remaining (now illegal) references to $(SRC) from a couple of Makefile.ams * Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in * Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR from most configure scripts, i.e. LIBCDIR becomes less visible) * Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to libbsp/*/configure.ins (A minor bug in previous implementations, which only has an impact when switching to GNU/Cygnus canonicalization) * Cleans up several bogus comments. * Removes MKLIB * Switches the version number to 4.5.0 (for testing version number handling)
2025-11-16 12:34:45 +00:00 · 2000-02-08 22:33:25 +00:00
parent a976681e47
commit 70810dcd89
165 changed files with 658 additions and 678 deletions
--- a/aclocal/canonicalize-tools.m4
+++ b/aclocal/canonicalize-tools.m4
@@ -13,16 +13,7 @@ dnl

 AC_DEFUN(RTEMS_GCC_PRINT,
 [
-dnl case $host_os in
-dnl  *cygwin*)
-dnl    dnl FIXME: Hack for cygwin/egcs reporting mixed '\\' and '/'
-dnl    dnl        Should be removed once cygwin/egcs reports '/' only
-dnl    $1=`$CC_FOR_TARGET --print-prog-name=$2 | sed -e 's%\\\\%/%g' `
-dnl    ;;
-dnl  *)
    $1=`$CC_FOR_TARGET --print-prog-name=$2`
-dnl    ;;
-dnl  esac
 ])

 AC_DEFUN(RTEMS_PATH_TOOL,
--- a/aclocal/gcc-pipe.m4
+++ b/aclocal/gcc-pipe.m4
@@ -11,17 +11,11 @@ AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts --pipe,rtems_cv_gcc_pipe,
 [
 rtems_cv_gcc_pipe=no
 if test "$rtems_cv_prog_gcc" = "yes"; then
-dnl case "$host_os" in
-dnl   cygwin*)
-dnl    ;;
-dnl  *)
    echo 'void f(){}' >conftest.c
    if test -z "`${CC_FOR_TARGET} --pipe -c conftest.c 2>&1`";then
      rtems_cv_gcc_pipe=yes
    fi
    rm -f conftest*
-dnl    ;;
-dnl esac
 fi
 ])
 ])
--- a/aclocal/prog-cc.m4
+++ b/aclocal/prog-cc.m4
@@ -12,6 +12,7 @@ AC_BEFORE([$0], [AC_PROG_CPP])dnl
 AC_BEFORE([$0], [AC_PROG_CC])dnl
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
+AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl

 dnl Only accept gcc and cc
 dnl NOTE: This might be too restrictive for native compilation
--- a/aclocal/prog-cxx.m4
+++ b/aclocal/prog-cxx.m4
@@ -12,6 +12,7 @@ AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
 AC_BEFORE([$0], [AC_PROG_CXX])dnl
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
+AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl

 dnl Only accept g++ and c++
 dnl NOTE: This might be too restrictive for native compilation
--- a/aclocal/project-root.m4
+++ b/aclocal/project-root.m4
@@ -15,9 +15,6 @@ AC_SUBST(PROJECT_ROOT)
 RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP
 AC_SUBST(RTEMS_ROOT)

-INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change"
-AC_SUBST(INSTALL_CHANGE)
-
 PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex"
 AC_SUBST(PACKHEX)

--- a/c/configure.in
+++ b/c/configure.in
@@ -100,8 +100,7 @@ AC_SUBST(RTEMS_BSP_LIST)

 AC_CONFIG_SUBDIRS(make)

-AC_CONFIG_SUBDIRS(make)
-
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 )
--- a/c/make/Makefile.am
+++ b/c/make/Makefile.am
@@ -1,17 +1,16 @@
-##
+## 
 ## $Id$
-##
+## 

 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

-rtems_makedir=$(prefix)/make
+rtems_makedir = $(prefix)/make

-GENERIC_FILES = \
-target.cfg
+GENERIC_FILES = target.cfg

-rtems_make_DATA = \
-$(GENERIC_FILES)
+rtems_make_DATA = $(GENERIC_FILES)
+
+EXTRA_DIST = target.cfg.in

-include $(top_srcdir)/../../automake/subdirs.am
 include $(top_srcdir)/../../automake/local.am
--- a/c/make/configure.in
+++ b/c/make/configure.in
@@ -24,14 +24,12 @@ RTEMS_ENABLE_RDBG
 RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_CXX
 RTEMS_ENABLE_GCC28
-RTEMS_ENABLE_LIBCDIR

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET

 dnl check for g++
@@ -44,17 +42,11 @@ RTEMS_CANONICALIZE_TOOLS
 AC_SUBST(rtems_cv_prog_cc_cross)
 AC_SUBST(RTEMS_HAS_POSIX)
 AC_SUBST(RTEMS_HOST)
-AC_SUBST(RTEMS_HAS_MULTIPROCESSING)
-AC_SUBST(RTEMS_HAS_POSIX_API)
-AC_SUBST(RTEMS_HAS_ITRON_API)
-AC_SUBST(RTEMS_HAS_NETWORKING)
-AC_SUBST(RTEMS_HAS_RDBG)
 AC_SUBST(RTEMS_HAS_CPLUSPLUS)
-AC_SUBST(RTEMS_USE_MACROS)
 AC_SUBST(RTEMS_USE_GCC272)
-AC_SUBST(RTEMS_LIBC_DIR)
 AC_SUBST(RTEMS_CPU)

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 target.cfg
--- a/c/src/configure.in
+++ b/c/src/configure.in
@@ -57,6 +57,7 @@ AC_CONFIG_SUBDIRS(tests)

 RTEMS_PROJECT_ROOT

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 wrapup/Makefile
--- a/c/src/exec/configure.in
+++ b/c/src/exec/configure.in
@@ -16,7 +16,6 @@ RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_ITRON
 RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_GCC28
-RTEMS_ENABLE_LIBCDIR

 RTEMS_ENV_RTEMSBSP

@@ -25,7 +24,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -69,7 +67,7 @@ fi
 AC_CONFIG_SUBDIRS($cfg_subdirs)
 AC_CONFIG_SUBDIRS(score/cpu/$RTEMS_CPU)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/itron/configure.in
+++ b/c/src/exec/itron/configure.in
@@ -23,10 +23,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-## FIXME: needed for INSTALL_CHANGE in autoconf subdirectories
-RTEMS_PATH_KSH
-
-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -60,7 +56,7 @@ fi
 ##
 ## FIXME: We configure and build the macros subdirectory, too.
 ## Should probably use AM_CONDITIONALs to disable them in future
-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 src/Makefile
--- a/c/src/exec/itron/src/Makefile.am
+++ b/c/src/exec/itron/src/Makefile.am
@@ -43,7 +43,6 @@ C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \
    $(TIME_C_FILES)
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)

-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
--- a/c/src/exec/libcsupport/src/Makefile.am
+++ b/c/src/exec/libcsupport/src/Makefile.am
@@ -98,7 +98,6 @@ $(PROJECT_INCLUDE)/sys/%.h: %.h
 TMPINSTALL_FILES += \
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a

-SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES)
 OBJS = $(C_O_FILES)

 #
@@ -117,7 +116,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)

 DOC_FILES = TODO CASES

-## This only works with automake > 1.14
 EXTRA_DIST = \
 $(DOC_FILES) \
 $(COMMON_C_FILES) $(EMBEDDED_C_FILES) $(UNIX_C_FILES) \
--- a/c/src/exec/posix/configure.in
+++ b/c/src/exec/posix/configure.in
@@ -23,10 +23,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-## FIXME: needed for INSTALL_CHANGE in autoconf subdirectories
-RTEMS_PATH_KSH
-
-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -66,7 +62,7 @@ fi
 ##
 ## FIXME: We configure and build the macros subdirectory, too.
 ## Should probably use AM_CONDITIONALs to disable them in future
-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 src/Makefile
--- a/c/src/exec/posix/src/Makefile.am
+++ b/c/src/exec/posix/src/Makefile.am
@@ -81,7 +81,6 @@ C_FILES = adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \
    $(BUILD_FOR_NOW_C_FILES) utsname.c
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)

-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -94,7 +93,7 @@ include $(top_srcdir)/../../../../automake/lib.am
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 AM_CFLAGS += $(CFLAGS_OS_V)

-all: ${ARCH} $(SRCS) ${OBJS}
+all: ${ARCH} ${OBJS}

 # temporary so we can see how many things are left to implement
 not: 
--- a/c/src/exec/rtems/src/Makefile.am
+++ b/c/src/exec/rtems/src/Makefile.am
@@ -63,7 +63,6 @@ endif

 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)

-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)

 #
@@ -73,7 +72,7 @@ OBJS = $(C_O_FILES)
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 AM_CFLAGS += $(CFLAGS_OS_V)

-all: ${ARCH} $(SRCS) ${OBJS}
+all: ${ARCH} ${OBJS}

 EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES)

--- a/c/src/exec/sapi/src/Makefile.am
+++ b/c/src/exec/sapi/src/Makefile.am
@@ -8,7 +8,6 @@ C_FILES = debug.c entrytable.c extension.c fatal.c exinit.c io.c itronapi.c \
    posixapi.c rtemsapi.c
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)

-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
--- a/c/src/exec/score/cpu/a29k/configure.in
+++ b/c/src/exec/score/cpu/a29k/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-a29k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/hppa1.1/configure.in
+++ b/c/src/exec/score/cpu/hppa1.1/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-hppa1.1,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/i386/configure.in
+++ b/c/src/exec/score/cpu/i386/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-i386,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/i960/configure.in
+++ b/c/src/exec/score/cpu/i960/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-i960,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/m68k/configure.in
+++ b/c/src/exec/score/cpu/m68k/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-m68k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/mips/configure.in
+++ b/c/src/exec/score/cpu/mips/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-mips64orion,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/mips64orion/configure.in
+++ b/c/src/exec/score/cpu/mips64orion/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-mips64orion,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/no_cpu/configure.in
+++ b/c/src/exec/score/cpu/no_cpu/configure.in
@@ -9,11 +9,9 @@ AC_CONFIG_AUX_DIR(../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU

-AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sparc,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-no_cpu,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/powerpc/configure.in
+++ b/c/src/exec/score/cpu/powerpc/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-powerpc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -33,7 +30,7 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

 AM_CONDITIONAL(PPC_NEW_EXCEPTION_PROCESSING,test "$RTEMS_CPU_MODEL" = "mpc750" -o "$RTEMS_CPU_MODEL" = "mpc604")

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 shared/Makefile
--- a/c/src/exec/score/cpu/sh/configure.in
+++ b/c/src/exec/score/cpu/sh/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sh,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -31,7 +28,7 @@ RTEMS_CHECK_NEWLIB
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/sparc/configure.in
+++ b/c/src/exec/score/cpu/sparc/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sparc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP

 RTEMS_CHECK_CPU
@@ -21,7 +19,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -30,7 +27,7 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/cpu/unix/configure.in
+++ b/c/src/exec/score/cpu/unix/configure.in
@@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-unix,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
 RTEMS_ENABLE_MULTIPROCESSING

 RTEMS_ENV_RTEMSBSP
@@ -22,7 +21,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -37,7 +35,7 @@ if test "$HAS_MP" = "yes"; then
  RTEMS_CHECK_SYSV_UNIX
 fi

-# Try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 rtems/Makefile
--- a/c/src/exec/score/src/Makefile.am
+++ b/c/src/exec/score/src/Makefile.am
@@ -64,7 +64,6 @@ C_FILES = $(STD_C_FILES)
 endif
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)

-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)

 #
--- a/c/src/lib/configure.in
+++ b/c/src/lib/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE

 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING
-RTEMS_ENABLE_LIBCDIR
 RTEMS_ENABLE_BARE
 RTEMS_ENABLE_HWAPI

@@ -24,7 +23,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -51,7 +49,7 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")

 AC_CONFIG_SUBDIRS($cfg_subdirs)

-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 include/Makefile
--- a/c/src/lib/libbsp/a29k/configure.in
+++ b/c/src/lib/libbsp/a29k/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/a29k/portsw/configure.in
+++ b/c/src/lib/libbsp/a29k/portsw/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-a29k-portsw,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING

 RTEMS_ENV_RTEMSBSP
@@ -20,11 +21,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 console/Makefile
--- a/c/src/lib/libbsp/bare/configure.in
+++ b/c/src/lib/libbsp/bare/configure.in
@@ -18,7 +18,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 include/Makefile)
--- a/c/src/lib/libbsp/configure.in
+++ b/c/src/lib/libbsp/configure.in
@@ -12,7 +12,8 @@ AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

 RTEMS_ENABLE_MULTIPROCESSING
-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_BARE

 RTEMS_ENV_RTEMSBSP
@@ -20,12 +21,6 @@ RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
-dnl check target cc
-RTEMS_PROG_CC_FOR_TARGET
-RTEMS_CANONICALIZE_TOOLS
-
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)

@@ -59,7 +54,9 @@ cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR"
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 AC_CONFIG_SUBDIRS($cfg_subdirs)

-# Explicitly list all Makefiles
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 shmdr/Makefile)
--- a/c/src/lib/libbsp/hppa1.1/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-hppa1.1-simhppa,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING

 RTEMS_ENV_RTEMSBSP
@@ -20,13 +21,13 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

 AC_CONFIG_SUBDIRS(tools)

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 include/Makefile
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in
@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU

-AM_INIT_AUTOMAKE(rtems-lib-libbsp-hppa-simhppa-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-hppa1.1-simhppa-tools,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 AC_EXEEXT

@@ -20,5 +20,6 @@ AM_CONFIG_HEADER(config.h)
 RTEMS_PROJECT_ROOT
 RTEMS_TOOLPATHS

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/i386/configure.in
+++ b/c/src/lib/libbsp/i386/configure.in
@@ -19,7 +19,7 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 shared/Makefile
--- a/c/src/lib/libbsp/i386/i386ex/configure.in
+++ b/c/src/lib/libbsp/i386/i386ex/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-i386ex,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -23,10 +24,11 @@ dnl if this is an i386, does gas have good code16 support?
 RTEMS_I386_GAS_CODE16
 AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")

-# Explicitly list all Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/i386/pc386/configure.in
+++ b/c/src/lib/libbsp/i386/pc386/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-pc386,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -23,13 +24,15 @@ dnl if this is an i386, does gas have good code16 support?
 RTEMS_I386_GAS_CODE16
 AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")

 AC_CONFIG_SUBDIRS(tools)

 AC_SUBST(RTEMS_BSP)
-# Explicitly list all Makefile here 
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/i386/pc386/tools/configure.in
+++ b/c/src/lib/libbsp/i386/pc386/tools/configure.in
@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU

-AM_INIT_AUTOMAKE(rtems-lib-libbsp-i386-pc386-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-pc386-tools,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 AC_EXEEXT

@@ -20,5 +20,6 @@ AC_CHECK_FUNCS(strtoul)
 RTEMS_PROJECT_ROOT
 RTEMS_TOOLPATHS

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/i386/ts_386ex/configure.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/configure.in
@@ -8,10 +8,11 @@ RTEMS_TOP(../../../../../..)
 AC_CONFIG_AUX_DIR(../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-ts_i386ex,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-ts_386ex,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -23,12 +24,13 @@ dnl if this is an i386, does gas have good code16 support?
 RTEMS_I386_GAS_CODE16
 AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")

 AC_CONFIG_SUBDIRS(tools)

-# Explicitly list all Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/configure.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/configure.in
@@ -8,12 +8,13 @@ AC_CONFIG_AUX_DIR(../../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU

-AM_INIT_AUTOMAKE(rtems-lib-libbsp-i386-ts_386ex-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386-ts_386ex-tools,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

 RTEMS_PROJECT_ROOT
 RTEMS_TOOLPATHS

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 dos_sup/Makefile
--- a/c/src/lib/libbsp/i960/configure.in
+++ b/c/src/lib/libbsp/i960/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/i960/cvme961/configure.in
+++ b/c/src/lib/libbsp/i960/cvme961/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-cvme961,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING

 RTEMS_ENV_RTEMSBSP
@@ -20,11 +21,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/i960/rxgen960/configure.in
+++ b/c/src/lib/libbsp/i960/rxgen960/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-rxgen960,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING

 RTEMS_ENV_RTEMSBSP
@@ -20,11 +21,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
@@ -32,18 +32,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)

-# FIXME: The original Makefile.in contained this:
-#> XXX: JRS look at the list of objects installed
-#>	$(INSTALL_CHANGE) -m 644 $(OBJS) $(PROJECT_RELEASE)/lib
-#
-# The install_change line could probably be replaced by this:
-# $(PROJECT_RELEASE)/lib/%.o: $(ARCH)/%.o
-#	$(INSTALL_DATA) $< $@
-# TMPINSTALL_FILES += \
-#  $(OBJS:$(ARCH)/%.o=$(PROJECT_RELEASE)/lib/%.o)
-#
-# .. but this behavior seems to be rather questionable :(
-
 $(PROJECT_RELEASE)/lib/linkcmds: linkcmds
 	$(INSTALL_DATA) $< $@

--- a/c/src/lib/libbsp/m68k/configure.in
+++ b/c/src/lib/libbsp/m68k/configure.in
@@ -19,7 +19,7 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 shared/Makefile)
--- a/c/src/lib/libbsp/m68k/dmv152/configure.in
+++ b/c/src/lib/libbsp/m68k/dmv152/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-dmv152,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/efi332/configure.in
+++ b/c/src/lib/libbsp/m68k/efi332/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-efi332,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/efi68k/configure.in
+++ b/c/src/lib/libbsp/m68k/efi68k/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-efi68k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/gen68302/configure.in
+++ b/c/src/lib/libbsp/m68k/gen68302/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-gen68302,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/gen68340/configure.in
+++ b/c/src/lib/libbsp/m68k/gen68340/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-gen68340,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/gen68360/configure.in
+++ b/c/src/lib/libbsp/m68k/gen68360/configure.in
@@ -8,10 +8,11 @@ RTEMS_TOP(../../../../../..)
 AC_CONFIG_AUX_DIR(../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-dmv152,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-gen68360,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -19,10 +20,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am
@@ -33,9 +33,13 @@ $(PROJECT_RELEASE)/lib/linkcmds: linkcmds
 $(PROJECT_RELEASE)/lib/linkcmds.prom: linkcmds.prom
 	$(INSTALL_DATA) $< $@

+$(PROJECT_RELEASE)/lib/linkcmds.bootp: linkcmds.bootp
+	$(INSTALL_DATA) $< $@
+
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \
-    $(PROJECT_RELEASE)/lib/linkcmds.prom
+    $(PROJECT_RELEASE)/lib/linkcmds.prom \
+    $(PROJECT_RELEASE)/lib/linkcmds.bootp

 all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)

--- a/c/src/lib/libbsp/m68k/idp/configure.in
+++ b/c/src/lib/libbsp/m68k/idp/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-idp,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/mvme136/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme136/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme136,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -23,7 +24,7 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/mvme147/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme147/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme147,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/mvme147s/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme147s/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme147s,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -23,7 +24,7 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/mvme162/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme162/configure.in
@@ -11,18 +11,19 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme162,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
 AC_CONFIG_SUBDIRS(tools)

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU

-AM_INIT_AUTOMAKE(rtems-lib-libbsp-m68k-mvme162-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme162-tools,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 AC_EXEEXT

@@ -21,5 +21,6 @@ AC_FUNC_MMAP
 RTEMS_PROJECT_ROOT
 RTEMS_TOOLPATHS

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/m68k/mvme167/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme167/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme167,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/m68k/ods68302/configure.in
+++ b/c/src/lib/libbsp/m68k/ods68302/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-ods68302,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/mips/configure.in
+++ b/c/src/lib/libbsp/mips/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/mips/p4000/configure.in
+++ b/c/src/lib/libbsp/mips/p4000/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-mips64orion-p4000,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 console/Makefile
--- a/c/src/lib/libbsp/mips64orion/configure.in
+++ b/c/src/lib/libbsp/mips64orion/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/mips64orion/p4000/configure.in
+++ b/c/src/lib/libbsp/mips64orion/p4000/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-mips64orion-p4000,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 console/Makefile
--- a/c/src/lib/libbsp/no_cpu/configure.in
+++ b/c/src/lib/libbsp/no_cpu/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/no_cpu/no_bsp/configure.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu-no_bsp,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING

 RTEMS_ENV_RTEMSBSP
@@ -20,11 +21,11 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/powerpc/configure.in
+++ b/c/src/lib/libbsp/powerpc/configure.in
@@ -20,7 +20,7 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 shared/Makefile
--- a/c/src/lib/libbsp/powerpc/dmv177/configure.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-dmv177,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING

@@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/powerpc/eth_comm/configure.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-eth_comm,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING

@@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 canbus/Makefile
--- a/c/src/lib/libbsp/powerpc/helas403/configure.in
+++ b/c/src/lib/libbsp/powerpc/helas403/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-helas403,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING

@@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 dlentry/Makefile
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-motorola_powerpc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING

@@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 bootloader/Makefile
--- a/c/src/lib/libbsp/powerpc/papyrus/configure.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-papyrus,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING

@@ -22,11 +23,12 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 dlentry/Makefile
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-ppcn_60x,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING

 RTEMS_ENV_RTEMSBSP
@@ -20,16 +21,15 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
 # Don't build the network directory
 # The problem is that the code there has not yet been converted to
 # bsd networking
 AM_CONDITIONAL(HAS_NETWORKING,false)
 # AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")

+RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/powerpc/psim/configure.in
+++ b/c/src/lib/libbsp/powerpc/psim/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-psim,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING

 RTEMS_ENV_RTEMSBSP
@@ -20,12 +21,13 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

 AC_CONFIG_SUBDIRS(tools)

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/powerpc/psim/tools/configure.in
+++ b/c/src/lib/libbsp/powerpc/psim/tools/configure.in
@@ -8,11 +8,12 @@ AC_CONFIG_AUX_DIR(../../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU

-AM_INIT_AUTOMAKE(rtems-lib-libbsp-powerpc-psim-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-psim-tools,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

 RTEMS_PROJECT_ROOT
 RTEMS_TOOLPATHS

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/powerpc/score603e/configure.in
+++ b/c/src/lib/libbsp/powerpc/score603e/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-score603e,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 PCI_bus/Makefile
--- a/c/src/lib/libbsp/sh/configure.in
+++ b/c/src/lib/libbsp/sh/configure.in
@@ -19,7 +19,7 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 shared/Makefile)
--- a/c/src/lib/libbsp/sh/gensh1/configure.in
+++ b/c/src/lib/libbsp/sh/gensh1/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sh-gensh1,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,6 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 console/Makefile
--- a/c/src/lib/libbsp/sh/gensh2/configure.in
+++ b/c/src/lib/libbsp/sh/gensh2/configure.in
@@ -11,7 +11,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sh-gensh2,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -20,7 +21,7 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-# Explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 console/Makefile
--- a/c/src/lib/libbsp/sparc/configure.in
+++ b/c/src/lib/libbsp/sparc/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/sparc/erc32/configure.in
+++ b/c/src/lib/libbsp/sparc/erc32/configure.in
@@ -11,18 +11,19 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sparc-erc32,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS

 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

-RTEMS_PROJECT_ROOT
-
 AC_CONFIG_SUBDIRS(tools)

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/sparc/erc32/tools/configure.in
+++ b/c/src/lib/libbsp/sparc/erc32/tools/configure.in
@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU

-AM_INIT_AUTOMAKE(rtems-lib-libbsp-sparc-erc32-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sparc-erc32-tools,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

 RTEMS_PATH_KSH
@@ -16,6 +16,7 @@ RTEMS_PATH_KSH
 RTEMS_PROJECT_ROOT
 RTEMS_TOOLPATHS

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 runtest)
--- a/c/src/lib/libbsp/unix/configure.in
+++ b/c/src/lib/libbsp/unix/configure.in
@@ -19,6 +19,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 AC_CONFIG_SUBDIRS($bspdir)

-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libbsp/unix/posix/configure.in
+++ b/c/src/lib/libbsp/unix/posix/configure.in
@@ -11,7 +11,9 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix-posix,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_PROG_CXX_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_CXX

@@ -22,14 +24,15 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

 RTEMS_CHECK_CXX
-RTEMS_PROJECT_ROOT

 AC_CONFIG_SUBDIRS(tools)
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

 AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes")

-# Explicitly list a Makefile here 
+RTEMS_PROJECT_ROOT
+
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libbsp/unix/posix/tools/configure.in
+++ b/c/src/lib/libbsp/unix/posix/tools/configure.in
@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../../../../../../..)

 RTEMS_CANONICAL_TARGET_CPU

-AM_INIT_AUTOMAKE(rtems-lib-libbsp-unix-posix-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix-posix-tools,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

 RTEMS_PATH_KSH
@@ -19,6 +19,7 @@ AM_CONDITIONAL(PERL,test -n "$PERL")
 RTEMS_PROJECT_ROOT
 RTEMS_TOOLPATHS

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 runtest
--- a/c/src/lib/libc/Makefile.am
+++ b/c/src/lib/libc/Makefile.am
@@ -98,7 +98,6 @@ $(PROJECT_INCLUDE)/sys/%.h: %.h
 TMPINSTALL_FILES += \
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a

-SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES)
 OBJS = $(C_O_FILES)

 #
@@ -117,7 +116,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)

 DOC_FILES = TODO CASES

-## This only works with automake > 1.14
 EXTRA_DIST = \
 $(DOC_FILES) \
 $(COMMON_C_FILES) $(EMBEDDED_C_FILES) $(UNIX_C_FILES) \
--- a/c/src/lib/libcpu/a29k/clock/Makefile.am
+++ b/c/src/lib/libcpu/a29k/clock/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #

-$(PGM): $(SRCS) $(OBJS)
+$(PGM): $(OBJS)
 	$(make-rel)

 all-local: $(ARCH) $(OBJS) $(PGM)
--- a/c/src/lib/libcpu/a29k/configure.in
+++ b/c/src/lib/libcpu/a29k/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-a29k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP

@@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libcpu/a29k/timer/Makefile.am
+++ b/c/src/lib/libcpu/a29k/timer/Makefile.am
@@ -20,13 +20,13 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #

-$(PGM): $(SRCS) $(OBJS)
+$(PGM): $(OBJS)
 	$(make-rel)

 all-local: $(ARCH) $(OBJS) $(PGM)

 .PRECIOUS: $(PGM)

-EXTRA_DIST = Makefile gettime.S timer.c timerisr.c
+EXTRA_DIST = Makefile timer.c timerisr.c

 include $(top_srcdir)/../../../../../automake/local.am
--- a/c/src/lib/libcpu/configure.in
+++ b/c/src/lib/libcpu/configure.in
@@ -22,5 +22,6 @@ AC_SUBST(RTEMS_CPU_SUBDIR)

 AC_CONFIG_SUBDIRS($RTEMS_CPU_SUBDIR)

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)
--- a/c/src/lib/libcpu/hppa1.1/configure.in
+++ b/c/src/lib/libcpu/hppa1.1/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-hppa1.1,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP

@@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libcpu/i386/configure.in
+++ b/c/src/lib/libcpu/i386/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-i386,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP

@@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile)

--- a/c/src/lib/libcpu/m68k/configure.in
+++ b/c/src/lib/libcpu/m68k/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-m68k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP

@@ -22,7 +20,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -31,6 +28,7 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

 AM_CONDITIONAL(m68040, test "$RTEMS_CPU_MODEL" = "m68040")

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 m68040/Makefile
--- a/c/src/lib/libcpu/mips/configure.in
+++ b/c/src/lib/libcpu/mips/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-mips64orion,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP

@@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libcpu/mips64orion/configure.in
+++ b/c/src/lib/libcpu/mips64orion/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-mips64orion,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP

@@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 clock/Makefile
--- a/c/src/lib/libcpu/powerpc/configure.in
+++ b/c/src/lib/libcpu/powerpc/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-powerpc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP

@@ -22,7 +20,6 @@ RTEMS_CANONICAL_HOST

 RTEMS_PROJECT_ROOT

-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

@@ -41,6 +38,7 @@ AM_CONDITIONAL(mpc821, test "$RTEMS_CPU_MODEL" = "mpc821")
 AM_CONDITIONAL(mpc860, test "$RTEMS_CPU_MODEL" = "mpc860")
 AM_CONDITIONAL(ppc403, test "$RTEMS_CPU_MODEL" = "ppc403")

+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 mpc505/Makefile
--- a/Show More
+++ b/Show More