From 73dc1521e442db0df12c4839620c8e9fbdce9f21 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 14 Dec 2003 16:35:54 +0000
Subject: 2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Remove RTEMS_BSP-subdir rule.
	* configure.ac: Let AC_CONFIG_FILES(Makefile..) append explictit
	rules for RTEMS_BSP-subdirs.
---
 c/ChangeLog    |  6 ++++++
 c/Makefile.am  | 13 -------------
 c/configure.ac | 15 ++++++++++++++-
 3 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'c')

diff --git a/c/ChangeLog b/c/ChangeLog
index 6581fc3bcf..2f8bfff5b1 100644
--- a/c/ChangeLog
+++ b/c/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove RTEMS_BSP-subdir rule.
+	* configure.ac: Let AC_CONFIG_FILES(Makefile..) append explictit
+	rules for RTEMS_BSP-subdirs.
+
 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Use mkdir_p instead of mkinstalldirs.
diff --git a/c/Makefile.am b/c/Makefile.am
index 5429470cbc..ac5c94191c 100644
--- a/c/Makefile.am
+++ b/c/Makefile.am
@@ -13,18 +13,6 @@ RTEMS_BSP = $(RTEMS_BSP_LIST)
 ## triggered before $(RTEMS_BSP_LIST) subdirectories are made.
 SUBDIRS = . $(RTEMS_BSP)
 
-## Use @RTEMS_BSP_LIST@ here, using $(RTEMS_BSP_LIST) would trigger
-## this rule for invalid BSPs
-@RTEMS_BSP_LIST@: src/configure
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	test -n "${RTEMS_BSP}" && for i in ${RTEMS_BSP}; do \
-	  echo "Configuring RTEMS_BSP=$$i"; \
-	  $(mkdir_p) $$i; \
-	  ( cd $$i && \
-	    CONFIG_SHELL=$(SHELL) RTEMS_BSP=$$i $(rtems_bsp_configure) ) \
-	  || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done
-
 ## Let all RTEMS' make targets depend on ${RTEMS_BSP}
 all-local: ${RTEMS_BSP}
 preinstall-am: ${RTEMS_BSP}
@@ -35,7 +23,6 @@ EXTRA_DIST = ACKNOWLEDGEMENTS
 EXTRA_DIST += TOOL_TARGETS
 
 DIST_SUBDIRS = ${RTEMS_BSP}
-## -------------------------------------------------------
 
 include $(top_srcdir)/../automake/host.am
 include $(top_srcdir)/../automake/subdirs.am
diff --git a/c/configure.ac b/c/configure.ac
index 5032a6779c..2a6bf267da 100644
--- a/c/configure.ac
+++ b/c/configure.ac
@@ -65,7 +65,20 @@ AC_SUBST(rtems_bsp_configure)
 AC_SUBST(RTEMS_BSP_LIST)
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile],[
+for bsp in : $RTEMS_BSP_LIST; do test "x$bsp" = x: && continue
+cat >> Makefile << BSPEOF
+
+$bsp: src/configure
+	@set fnord \$(MAKEFLAGS); amf=\[$]\[$]2; \\
+	  echo "Configuring RTEMS_BSP=$bsp"; \\
+	  \$(mkdir_p) $bsp; \\
+	  ( cd $bsp && \\
+	    CONFIG_SHELL=\$(SHELL) RTEMS_BSP=$bsp \$(rtems_bsp_configure) ) \\
+	  || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac;
+BSPEOF
+done
+],[RTEMS_BSP_LIST="$RTEMS_BSP_LIST"])
 AC_OUTPUT
 
 echo
-- 
cgit v1.2.3