# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1237763097 0
# Node ID 7f00c31a3235e37d8c69be6134f33d8b0808cf0c
# Parent  ea6ce077e35ebe01b9ce10a81bb3fb9ba31c6075
Allow broader dependency in generated config files:
- recognise '^# depends on ' pattern in config files
- use that pattern to generate appropriate dependency rules
- convert users of the old pattern to the new one

 /branches/newlib/config/libc/eglibc.in    |    2     1     1     0 +-
 /branches/newlib/config/config.mk         |   20     8    12     0 ++++++++------------
 /branches/newlib/config/arch/sh.in        |    2     1     1     0 +-
 /branches/newlib/config/arch/ia64.in      |    2     1     1     0 +-
 /branches/newlib/config/arch/powerpc64.in |    2     1     1     0 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff -r ea6ce077e35e -r 7f00c31a3235 config/arch/ia64.in
--- a/config/arch/ia64.in	Sun Mar 22 22:49:44 2009 +0000
+++ b/config/arch/ia64.in	Sun Mar 22 23:04:57 2009 +0000
@@ -1,5 +1,5 @@
 # ia64 specific config options
-# EXPERIMENTAL
+# depends on EXPERIMENTAL
 
 config ARCH_ia64
     select ARCH_64
diff -r ea6ce077e35e -r 7f00c31a3235 config/arch/powerpc64.in
--- a/config/arch/powerpc64.in	Sun Mar 22 22:49:44 2009 +0000
+++ b/config/arch/powerpc64.in	Sun Mar 22 23:04:57 2009 +0000
@@ -1,5 +1,5 @@
 # powerpc specific configuration file
-# EXPERIMENTAL
+# depends on EXPERIMENTAL
 
 config ARCH_powerpc64
     select ARCH_64
diff -r ea6ce077e35e -r 7f00c31a3235 config/arch/sh.in
--- a/config/arch/sh.in	Sun Mar 22 22:49:44 2009 +0000
+++ b/config/arch/sh.in	Sun Mar 22 23:04:57 2009 +0000
@@ -1,5 +1,5 @@
 # Super-H specific configuration file
-# EXPERIMENTAL
+# depends on EXPERIMENTAL
 
 config ARCH_sh
     select ARCH_SUPPORTS_BOTH_ENDIAN
diff -r ea6ce077e35e -r 7f00c31a3235 config/config.mk
--- a/config/config.mk	Sun Mar 22 22:49:44 2009 +0000
+++ b/config/config.mk	Sun Mar 22 23:04:57 2009 +0000
@@ -87,12 +87,10 @@
 	    _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;');        \
 	    echo "config $(3)_$${_entry}";                                      \
 	    echo "    bool";                                                    \
-	    printf "    prompt \"$${entry}";                                    \
-	    if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then   \
-	      echo " (EXPERIMENTAL)\"";                                         \
-	      echo "    depends on EXPERIMENTAL";                               \
-	    else                                                                \
-	      echo "\"";                                                        \
+	    echo "    prompt \"$${entry}\"";                                    \
+	    dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null);       \
+	    if [ -n "$${dep_val}" ]; then                                       \
+	      echo "    $${dep_val#\# }";                                       \
 	    fi;                                                                 \
 	    echo "";                                                            \
 	  done;                                                                 \
@@ -134,12 +132,10 @@
 	    _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;');        \
 	    echo "menuconfig $(3)_$${_entry}";                                  \
 	    echo "    bool";                                                    \
-	    printf "    prompt \"$${entry}";                                    \
-	    if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then   \
-	      echo " (EXPERIMENTAL)\"";                                         \
-	      echo "    depends on EXPERIMENTAL";                               \
-	    else                                                                \
-	      echo "\"";                                                        \
+	    echo "    prompt \"$${entry}\"";                                    \
+	    dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null);       \
+	    if [ -n "$${dep_val}" ]; then                                       \
+	      echo "    $${dep_val#\# }";                                       \
 	    fi;                                                                 \
 	    echo "if $(3)_$${_entry}";                                          \
 	    echo "source $${file}";                                             \
diff -r ea6ce077e35e -r 7f00c31a3235 config/libc/eglibc.in
--- a/config/libc/eglibc.in	Sun Mar 22 22:49:44 2009 +0000
+++ b/config/libc/eglibc.in	Sun Mar 22 23:04:57 2009 +0000
@@ -1,5 +1,5 @@
 # eglibc options
-# EXPERIMENTAL
+# depends on EXPERIMENTAL
 
 config LIBC_eglibc
     select LIBC_SUPPORT_NPTL