Add infrastructure to use common config files for generated config files.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Jan 31 11:29:50 2009 +0000 (2009-01-31)
changeset 117841a84f7d3b4f
parent 1177 748c418d3b6a
child 1179 619019337ead
Add infrastructure to use common config files for generated config files.

/trunk/config/libc/glibc-eglibc.in-common | 4 4 0 0 ++++
/trunk/config/config.mk | 4 4 0 0 ++++
/trunk/config/libc.in | 7 0 7 0 -------
3 files changed, 8 insertions(+), 7 deletions(-)
config/config.mk
config/libc.in
config/libc/glibc-eglibc.in-common
     1.1 --- a/config/config.mk	Thu Jan 29 22:35:26 2009 +0000
     1.2 +++ b/config/config.mk	Sat Jan 31 11:29:50 2009 +0000
     1.3 @@ -107,6 +107,10 @@
     1.4  	    echo "source $${file}";                                             \
     1.5  	    echo "endif";                                                       \
     1.6  	  done;                                                                 \
     1.7 +	  echo "";                                                              \
     1.8 +	  for file in $(wildcard $(4)/*.in-common); do                          \
     1.9 +	    echo "source $${file}";                                             \
    1.10 +	  done;                                                                 \
    1.11  	 ) >$(1)
    1.12  endef
    1.13  
     2.1 --- a/config/libc.in	Thu Jan 29 22:35:26 2009 +0000
     2.2 +++ b/config/libc.in	Sat Jan 31 11:29:50 2009 +0000
     2.3 @@ -63,13 +63,6 @@
     2.4  
     2.5  endchoice
     2.6  
     2.7 -# Hack: mconf does not allow to include a file multiple times,
     2.8 -# so include glibc and eglibc common options from here, rather
     2.9 -# than from each config files.
    2.10 -if LIBC_glibc || LIBC_eglibc
    2.11 -source config/libc/glibc-eglibc.in-common
    2.12 -endif
    2.13 -
    2.14  endmenu
    2.15  
    2.16  endif # ! BARE_METAL
     3.1 --- a/config/libc/glibc-eglibc.in-common	Thu Jan 29 22:35:26 2009 +0000
     3.2 +++ b/config/libc/glibc-eglibc.in-common	Sat Jan 31 11:29:50 2009 +0000
     3.3 @@ -1,6 +1,8 @@
     3.4  # This file contains the common configuration options
     3.5  # that apply to both glibc and eglibc.
     3.6  
     3.7 +if LIBC_glibc || LIBC_eglibc
     3.8 +
     3.9  comment "glibc/eglibc common options"
    3.10  
    3.11  config LIBC_GLIBC_EXTRA_CONFIG
    3.12 @@ -152,3 +154,5 @@
    3.13      default LIBC_GLIBC_MIN_KERNEL_VERSION if LIBC_GLIBC_USE_HEADERS_MIN_KERNEL
    3.14  
    3.15  endif # KERNEL_linux
    3.16 +
    3.17 +endif # LIBC_glibc || LIBC_eglibc