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)

16 files changed, 52 insertions, 33 deletions

diff --git a/c/src/lib/libbsp/m68k/configure.in b/c/src/lib/libbsp/m68k/configure.in
index 3dac2230e9..9f7909b448 100644
--- 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)
diff --git a/c/src/lib/libbsp/m68k/dmv152/configure.in b/c/src/lib/libbsp/m68k/dmv152/configure.in
index f33ffbb8a5..cdfd98b536 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/efi332/configure.in b/c/src/lib/libbsp/m68k/efi332/configure.in
index 8152a5aad9..b10452a4fe 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/efi68k/configure.in b/c/src/lib/libbsp/m68k/efi68k/configure.in
index 7f59ca61b4..0a07be38c6 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/gen68302/configure.in b/c/src/lib/libbsp/m68k/gen68302/configure.in
index 8d9c4d4d8e..f5daf792a6 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.in b/c/src/lib/libbsp/m68k/gen68340/configure.in
index a7af732493..7e24feb3d8 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.in b/c/src/lib/libbsp/m68k/gen68360/configure.in
index 2681e04884..73266d8d9e 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am
index 1a2848b7a6..c10a8eb294 100644
--- 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)
 
diff --git a/c/src/lib/libbsp/m68k/idp/configure.in b/c/src/lib/libbsp/m68k/idp/configure.in
index de18e48148..527802ca24 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/mvme136/configure.in b/c/src/lib/libbsp/m68k/mvme136/configure.in
index 6e59adc2b4..73e84bf628 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/mvme147/configure.in b/c/src/lib/libbsp/m68k/mvme147/configure.in
index 8ac430c2d2..cec018ab89 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.in b/c/src/lib/libbsp/m68k/mvme147s/configure.in
index 6278fedb18..1aa24ffe3a 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.in b/c/src/lib/libbsp/m68k/mvme162/configure.in
index a8a1d4f0ee..8a22c3f936 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
index 2fb3b588a7..514451c0bd 100644
--- 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)
diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.in b/c/src/lib/libbsp/m68k/mvme167/configure.in
index 3c4a5a4741..02052ba27e 100644
--- 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
diff --git a/c/src/lib/libbsp/m68k/ods68302/configure.in b/c/src/lib/libbsp/m68k/ods68302/configure.in
index 588b4b70a1..4885efbf4a 100644
--- 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