diff options
| -rw-r--r-- | rules/alsa-lib.in | 17 | ||||
| -rw-r--r-- | rules/alsa-utils.in | 4 | ||||
| -rw-r--r-- | rules/apache2.in | 31 | ||||
| -rw-r--r-- | rules/argtable2.in | 4 | ||||
| -rw-r--r-- | rules/atk.in | 4 | ||||
| -rw-r--r-- | rules/attr.in | 4 | ||||
| -rw-r--r-- | rules/bash.in | 23 | ||||
| -rw-r--r-- | rules/bind.in | 10 | ||||
| -rw-r--r-- | rules/bing.in | 2 | ||||
| -rw-r--r-- | rules/binutils.in | 9 | ||||
| -rw-r--r-- | rules/blackbox.in | 2 | ||||
| -rw-r--r-- | rules/bluez-libs.in | 4 | ||||
| -rw-r--r-- | rules/bluez-utils.in | 4 | ||||
| -rw-r--r-- | rules/bluez.in | 5 | ||||
| -rw-r--r-- | rules/bonniexx.in | 4 | ||||
| -rw-r--r-- | rules/boost.in | 81 | ||||
| -rw-r--r-- | rules/bridge-utils.in | 4 | ||||
| -rw-r--r-- | rules/busybox.in | 4 | ||||
| -rw-r--r-- | rules/cairo.in | 15 | ||||
| -rw-r--r-- | rules/cairomm.in | 4 | ||||
| -rw-r--r-- | rules/calibrator.in | 4 | ||||
| -rw-r--r-- | rules/canutils.in | 12 | ||||
| -rw-r--r-- | rules/cfgsh.in | 4 | ||||
| -rw-r--r-- | rules/chrony.in | 18 | ||||
| -rw-r--r-- | rules/clock.in | 4 | ||||
| -rw-r--r-- | rules/commoncpp2.in | 11 | ||||
| -rw-r--r-- | rules/commoncpp2.make | 4 | ||||
| -rw-r--r-- | rules/coreutils.in | 18 | ||||
| -rw-r--r-- | rules/cppunit.in | 4 | ||||
| -rw-r--r-- | rules/cpufrequtils.in | 10 | ||||
| -rw-r--r-- | rules/cvs.in | 23 | ||||
| -rw-r--r-- | rules/cyclictest.in | 4 |
32 files changed, 121 insertions, 230 deletions
diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in index d5e8562b8..b4f87b169 100644 --- a/rules/alsa-lib.in +++ b/rules/alsa-lib.in @@ -1,12 +1,13 @@ menuconfig ALSA_LIB - bool - prompt "Alsa Libaries " + tristate + prompt "alsa libaries " help This is the userspace library to the kernel's "Advanced Linux Sound Architecture" feature +if ALSA_LIB + config ALSA_LIB_RESMGR bool - depends on ALSA_LIB depends on BROKEN prompt "build resmgr" help @@ -14,7 +15,6 @@ config ALSA_LIB_RESMGR config ALSA_LIB_READ bool - depends on ALSA_LIB default y prompt "build read support" help @@ -22,7 +22,6 @@ config ALSA_LIB_READ config ALSA_LIB_MIXER bool - depends on ALSA_LIB default y prompt "build mixer" help @@ -30,7 +29,6 @@ config ALSA_LIB_MIXER config ALSA_LIB_PCM bool - depends on ALSA_LIB default y prompt "build pcm" help @@ -38,7 +36,6 @@ config ALSA_LIB_PCM config ALSA_LIB_RAWMIDI bool - depends on ALSA_LIB default y prompt "build raw midi support" help @@ -46,7 +43,6 @@ config ALSA_LIB_RAWMIDI config ALSA_LIB_HWDEP bool - depends on ALSA_LIB default y prompt "build hwdep" help @@ -54,7 +50,6 @@ config ALSA_LIB_HWDEP config ALSA_LIB_SEQ bool - depends on ALSA_LIB default y prompt "build sequencer" help @@ -62,7 +57,6 @@ config ALSA_LIB_SEQ config ALSA_LIB_INSTR bool - depends on ALSA_LIB default y prompt "build intrument support" help @@ -70,7 +64,6 @@ config ALSA_LIB_INSTR config ALSA_LIB_STATIC bool - depends on ALSA_LIB prompt "Build static library only" depends on BROKEN help @@ -80,3 +73,5 @@ config ALSA_LIB_STATIC speeding up things (if only one application uses this library) Note: This feature does not work yet. For example the esound daemon fails to link due to missing exported functions. + +endif diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in index d1eb453b3..092de9d47 100644 --- a/rules/alsa-utils.in +++ b/rules/alsa-utils.in @@ -1,6 +1,6 @@ config ALSA_UTILS - bool - prompt "Alsa Utils" + tristate + prompt "alsa utils " select NCURSES select ALSA_LIB # all tools from this package rely on special parts in the library: diff --git a/rules/apache2.in b/rules/apache2.in index 1d89733a6..05676f505 100644 --- a/rules/apache2.in +++ b/rules/apache2.in @@ -1,7 +1,8 @@ # Apache 2 configuration menuconfig APACHE2 - bool "Apache 2 HTTP Server" + tristate + prompt "apache 2 http server " select EXPAT select LIBC_RT select HOST_APACHE2 @@ -11,11 +12,11 @@ menuconfig APACHE2 improvements, such as threading, a new API, IPv6 support, request/response filtering, and more. +if APACHE2 + comment "build options ---" - depends on APACHE2 choice - depends on APACHE2 prompt "Multi Process Model" config APACHE2_MPM_PREFORK @@ -38,10 +39,8 @@ choice endchoice comment "runtime options ---" - depends on APACHE2 config APACHE2_SERVERROOT - depends on APACHE2 string prompt "ServerRoot directory" default "/usr/share/apache2" @@ -50,10 +49,9 @@ config APACHE2_SERVERROOT located. menuconfig ROOTFS_ETC_INITD_HTTPD - depends on APACHE2 - bool + tristate default y - prompt "Install startup script" + prompt "install startup script " help The /etc/init.d/httpd script lets you control the apache daemon. @@ -79,7 +77,6 @@ menuconfig ROOTFS_ETC_INITD_HTTPD endchoice config APACHE2_INSTALL_CONFIG - depends on APACHE2 bool default y prompt "Install httpd.conf" @@ -135,10 +132,8 @@ config APACHE2_SERVERADMIN SERVERADMIN entry in httpd.conf comment "Directories ---" - depends on APACHE2 config APACHE2_CONFIGDIR - depends on APACHE2 string default "/etc/apache2" prompt "Config directory" @@ -147,7 +142,6 @@ config APACHE2_CONFIGDIR searched here). config APACHE2_LOGDIR - depends on APACHE2 string default "/var/log/apache2" prompt "Logfile directory" @@ -155,7 +149,6 @@ config APACHE2_LOGDIR Apache's logfile directory. config APACHE2_DOCUMENTROOT - depends on APACHE2 string default "/var/www" prompt "DocumentRoot directory" @@ -166,7 +159,7 @@ config APACHE2_DOCUMENTROOT is provided). config APACHE2_DEFAULT_INDEX - depends on APACHE2 && APACHE2_DOCUMENTROOT != "" + depends APACHE2_DOCUMENTROOT != "" bool default y prompt "Default index.html" @@ -174,11 +167,10 @@ config APACHE2_DEFAULT_INDEX Install a demo HTML file, from project/generic/index.html. comment "Misc ---" - depends on APACHE2 config APACHE2_PUBLICDOMAINICONS bool "Public Domain Icons" - depends on APACHE2 && APACHE2_SERVERROOT != "" + depends APACHE2_SERVERROOT != "" default y help These icons were originally made for Mosaic for X and have been @@ -189,7 +181,7 @@ config APACHE2_PUBLICDOMAINICONS config APACHE2_CUSTOMERRORS bool "Multi Language Custom Error Documents" - depends on APACHE2 && APACHE2_SERVERROOT != "" + depends APACHE2_SERVERROOT != "" default y help Install HTTP error messages in multiple languages. If the preferred @@ -198,13 +190,12 @@ config APACHE2_CUSTOMERRORS Options, Language and ErrorDocument directives. comment "----------------------------------" - depends on APACHE2 comment "Apache 2 Modules" - depends on APACHE2 comment "----------------------------------" - depends on APACHE2 + +endif source "rules/apache2_mod_python.in" diff --git a/rules/argtable2.in b/rules/argtable2.in index 8dc6a4ca9..2485ca495 100644 --- a/rules/argtable2.in +++ b/rules/argtable2.in @@ -1,7 +1,7 @@ config ARGTABLE2 - bool - prompt "argtable2" + tristate + prompt "argtable2 " help Argtable is an ANSI C library for parsing GNU style command line arguments with a minimum of fuss. It enables the programmer to define diff --git a/rules/atk.in b/rules/atk.in index 19b7ed9d9..983877bfa 100644 --- a/rules/atk.in +++ b/rules/atk.in @@ -1,6 +1,6 @@ config ATK - bool - prompt "atk" + tristate + prompt "atk " select GLIB help ATK is a toolkit providing accessibility interfaces diff --git a/rules/attr.in b/rules/attr.in index 6335a6e5f..f8ccd6cc3 100644 --- a/rules/attr.in +++ b/rules/attr.in @@ -1,7 +1,7 @@ menuconfig ATTR - bool + tristate select HOST_GETTEXT if ATTR_GETTEXT - prompt "attr" + prompt "attr " help This is the extended attributes project for the ext2 and ext3 diff --git a/rules/bash.in b/rules/bash.in index 58fb5c877..6ce1306cb 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -1,5 +1,5 @@ menuconfig BASH - bool "Bash " + bool "bash " select LIBC_DL help The GNU Bourne Again SHell @@ -15,10 +15,11 @@ menuconfig BASH http://www.gnu.org/software/bash/ +if BASH + config BASH_SHLIKE bool prompt "Enable minimal sh like configuration" - depends on BASH help This produces a shell with minimal features, close to the historical Bourne shell. @@ -26,7 +27,6 @@ config BASH_SHLIKE config BASH_ALIASES bool prompt "Enable aliases" - depends on BASH help Aliases allow a string to be substituted for a word when it is used as the first word of a simple command. @@ -42,12 +42,10 @@ config BASH_ALIASES config BASH_ARRAY bool prompt "Include shell array variables" - depends on BASH config BASH_HISTORY bool prompt "Turn on csh-style history substitution" - depends on BASH help The bash shell supports a history expansion feature that is similar to the history expansion in csh. @@ -55,7 +53,6 @@ config BASH_HISTORY config BASH_BRACE bool prompt "Include brace expansion" - depends on BASH help Brace expansion is a mechanism by which arbitrary strings may be generated. This mechanism is similar @@ -71,7 +68,6 @@ config BASH_BRACE config BASH_DIRSTACK bool prompt "Enable builtins pushd/popd/dirs" - depends on BASH help Without options, "dirs" displays the list of currently remembered directories. The default @@ -89,14 +85,12 @@ config BASH_DIRSTACK config BASH_HELP bool prompt "Include the help builtin" - depends on BASH help This builtin supports minimal help features inside bash config BASH_CMDHISTORY bool prompt "Turn on command history" - depends on BASH help This enables command history features. The shell buffers commands in a ringbuffer, which can be listed, @@ -106,7 +100,6 @@ config BASH_CMDHISTORY config BASH_JOBS bool prompt "Enable job control features" - depends on BASH help This enables support for background jobs in bash. You can list the actual managed jobs by the "jobs" command. @@ -114,7 +107,6 @@ config BASH_JOBS config BASH_LARGEFILES bool prompt "Enable support for large files" - depends on BASH help Enable support for large files (LFS) if the operating system requires special compiler options to build programs @@ -123,7 +115,6 @@ config BASH_LARGEFILES config BASH_PROCSUBST bool prompt "Enable process substitution" - depends on BASH help This enables process substitution if the operating system provides the necessary support. @@ -134,7 +125,6 @@ config BASH_PROCSUBST config BASH_COMPLETION bool prompt "Enable programmable completion" - depends on BASH help Enable the programmable completion facilities. When word completion is attempted for an argument to a @@ -146,7 +136,6 @@ config BASH_COMPLETION config BASH_ESC bool prompt "Turn on escape character decoding in prompts" - depends on BASH help Turn on the interpretation of a number of backslash-escaped characters in the $PS1, $PS2, $PS3, and $PS4 prompt strings. @@ -154,7 +143,6 @@ config BASH_ESC config BASH_EDIT bool prompt "Turn on command line editing" - depends on BASH help Include support for command-line editing and history with the Bash version of the Readline library. @@ -162,7 +150,6 @@ config BASH_EDIT config BASH_RESTRICTED bool prompt "Enable a restricted shell" - depends on BASH help Include support for a restricted shell. If this is enabled, Bash enters a restricted mode, when called as rbash or invoked @@ -173,7 +160,6 @@ config BASH_RESTRICTED config BASH_SELECT bool prompt "Include select command" - depends on BASH help Include the select builtin, which allows the generation of simple menus. @@ -181,7 +167,6 @@ config BASH_SELECT config BASH_GPROF bool prompt "Allow profiling with gprof" - depends on BASH help This builds a Bash binary that produces profiling information to be processed by gprof each time it is executed. @@ -189,8 +174,8 @@ config BASH_GPROF config BASH_STATIC bool prompt "Link bash statically" - depends on BASH help This causes Bash to be linked statically, if gcc is being used. This could be used to build a version to use as root's shell. +endif diff --git a/rules/bind.in b/rules/bind.in index 0bc1f23ac..a9dbc93df 100644 --- a/rules/bind.in +++ b/rules/bind.in @@ -1,8 +1,8 @@ # bind 9 configuration menuconfig BIND - prompt "bind 9 " - bool + tristate + prompt "bind 9 " select OPENSSL help The Berkeley Internet Name Domain (BIND) implements @@ -18,18 +18,18 @@ menuconfig BIND encryption, multiple views on your dns zones and dynamic zone updates. +if BIND config BIND_THREADS bool prompt "enable threads" - depends on BIND && GLIBC_PTHREADS + depends GLIBC_PTHREADS help Specify this to build a multithreaded BIND config BIND_CRYPTO bool prompt "enable DNSSEC" - depends on BIND select OPENSSL help Enables support for secure dns updates @@ -37,9 +37,9 @@ config BIND_CRYPTO config BIND_IPV6 bool prompt "enable IPv6" - depends BIND help Enables support for IPv6, the upcoming default version of IP which is designed to be an evolutionary step from IPv4 +endif diff --git a/rules/bing.in b/rules/bing.in index bc1366c8a..9c397145b 100644 --- a/rules/bing.in +++ b/rules/bing.in @@ -1,6 +1,6 @@ config BING tristate - prompt "bing " + prompt "bing " help Empirical stochastic bandwidth tester (bing) diff --git a/rules/binutils.in b/rules/binutils.in index bdc76699c..eee297c43 100644 --- a/rules/binutils.in +++ b/rules/binutils.in @@ -1,18 +1,19 @@ # binutils configuration menuconfig BINUTILS - bool - prompt "binutils " + tristate + prompt "binutils " help The GNU binutils are needed for some debug utilities, like oprofile. +if BINUTILS + config BINUTILS_READELF bool - depends on BINUTILS prompt "readelf" config BINUTILS_OBJDUMP bool - depends on BINUTILS prompt "objdump" +endif diff --git a/rules/blackbox.in b/rules/blackbox.in index 297cbd28a..1a34e63da 100644 --- a/rules/blackbox.in +++ b/rules/blackbox.in @@ -1,5 +1,5 @@ config BLACKBOX - bool + tristate prompt "blackbox window manager [BROKEN]" depends on BROKEN select XORG_LIB_X11 diff --git a/rules/bluez-libs.in b/rules/bluez-libs.in index 22dc42ca3..e57d3a319 100644 --- a/rules/bluez-libs.in +++ b/rules/bluez-libs.in @@ -1,6 +1,6 @@ config BLUEZ_LIBS - bool - prompt "bluez-libs" + tristate + prompt "bluez-libs " depends on BLUEZ help bluez libraries, needed to build bluez-utils. For details diff --git a/rules/bluez-utils.in b/rules/bluez-utils.in index 033b71bcb..b068b5c35 100644 --- a/rules/bluez-utils.in +++ b/rules/bluez-utils.in @@ -1,6 +1,6 @@ config BLUEZ_UTILS - bool - prompt "bluez-utils" + tristate + prompt "bluez-utils " depends on BLUEZ select BLUEZ_LIBS select DBUS diff --git a/rules/bluez.in b/rules/bluez.in index 51ea8008c..af495fdde 100644 --- a/rules/bluez.in +++ b/rules/bluez.in @@ -1,9 +1,12 @@ menuconfig BLUEZ - bool "bluez " + bool + prompt "bluez " help bluez is the official Bluetooth stack in the Linux kernel. This packet offers user space utilities and libraries to work with the stack. + source "rules/bluez-utils.in" source "rules/bluez-libs.in" + diff --git a/rules/bonniexx.in b/rules/bonniexx.in index d3ec39998..c7651d266 100644 --- a/rules/bonniexx.in +++ b/rules/bonniexx.in @@ -1,6 +1,6 @@ config BONNIEXX - bool - prompt "bonnie++" + tristate + prompt "bonnie++ " select GCCLIBS_CXX help Hard drive bottleneck testing benchmark suite diff --git a/rules/boost.in b/rules/boost.in index f070cebac..93f49b4e2 100644 --- a/rules/boost.in +++ b/rules/boost.in @@ -1,8 +1,8 @@ # boost configuration menuconfig BOOST - bool - prompt "boost " + tristate + prompt "boost " help Boost provides free peer-reviewed portable C++ source libraries. The @@ -22,34 +22,30 @@ menuconfig BOOST http://www.boost.org/ +if BOOST + # config BOOST_ALGORIGHM # bool -# depends on BOOST # prompt "algorithm" # # config BOOST_ANY # bool -# depends on BOOST # prompt "any" # # config BOOST_ARRAY # bool -# depends on BOOST # prompt "array" # # config BOOST_ASSIGN # bool -# depends on BOOST # prompt "assign" # # config BOOST_BIND # bool -# depends on BOOST # prompt "bind" # # config BOOST_COMPATIBILITY # bool -# depends on BOOST # prompt "compatibility" # help # Bootst library. @@ -57,7 +53,6 @@ menuconfig BOOST # compose # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -65,7 +60,6 @@ menuconfig BOOST # concept_check # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -73,7 +67,6 @@ menuconfig BOOST # config # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -81,7 +74,6 @@ menuconfig BOOST # conversion # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -89,7 +81,6 @@ menuconfig BOOST # crc # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -97,7 +88,6 @@ menuconfig BOOST # date_time # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -105,7 +95,6 @@ menuconfig BOOST # detail # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -113,7 +102,6 @@ menuconfig BOOST # disjoint_sets # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -121,7 +109,6 @@ menuconfig BOOST # dynamic_bitset # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -129,14 +116,12 @@ menuconfig BOOST # expected_results.xml # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. config BOOST_FILESYSTEM bool - depends on BOOST prompt "filesystem" help Boost filesystem library. @@ -144,7 +129,6 @@ config BOOST_FILESYSTEM # format # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -152,7 +136,6 @@ config BOOST_FILESYSTEM # function # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -160,7 +143,6 @@ config BOOST_FILESYSTEM # functional # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -168,7 +150,6 @@ config BOOST_FILESYSTEM # graph # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -176,49 +157,42 @@ config BOOST_FILESYSTEM # integer # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # io # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # iostreams # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # iterator # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # lambda # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # libraries.htm # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # logic # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -226,175 +200,150 @@ config BOOST_FILESYSTEM # math # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # mem_fn # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # mpl # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # multi_array # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # multi_index # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # numeric # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # optional # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # parameter # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # platform_maintainers.txt # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # pool # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # preprocessor # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # program_options # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # property_map # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # ptr_container # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # python # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # random # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # range # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # rational # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # regex # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # serialization # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # signals # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # smart_ptr # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # spirit # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # static_assert # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # test # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -402,7 +351,6 @@ config BOOST_FILESYSTEM config BOOST_THREAD bool - depends on BOOST prompt "thread" help Portable C++ multi-threading library. @@ -410,49 +358,42 @@ config BOOST_THREAD # timer # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # tokenizer # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # tuple # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # type_traits # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # utility # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # variant # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. # wave # config BOOST_ # bool -# depends on BOOST # prompt "" # help # Bootst library. @@ -462,77 +403,66 @@ config BOOST_THREAD config BOOST_REGEX bool - depends on BOOST prompt "regex" help Boost regex library. # config BOOST_SIGNALS # bool -# depends on BOOST # prompt "signals" # help # Bootst signals library. # config BOOST_SERIALIZATION bool - depends on BOOST prompt "serialization" help Bootst serialization library. # # config BOOST_THREAD # bool -# depends on BOOST # prompt "thread" # help # Bootst thread library. # # config BOOST_PYTHON # bool -# depends on BOOST # prompt "python bindings" # help # Bootst python library. # # config BOOST_FILESYSTEM # bool -# depends on BOOST # prompt "filesystem" # help # Bootst filesystem library. # # config BOOST_WAVE # bool -# depends on BOOST # prompt "wave" # help # Bootst wave library. # # config BOOST_DATE_TIME # bool -# depends on BOOST # prompt "date_time" # help # Bootst regexp library. # # config BOOST_IOSTREAMS # bool -# depends on BOOST # prompt "iostreams" # help # Bootst regexp library. # # config BOOST_TEST # bool -# depends on BOOST # prompt "test" # help # Bootst test library. # config BOOST_PROGRAM_OPTIONS bool - depends on BOOST prompt "program options" help FIXME @@ -540,8 +470,9 @@ config BOOST_PROGRAM_OPTIONS # # config BOOST_GRAPH # bool -# depends on BOOST # prompt "graph" # help # Bootst regexp library. # + +endif diff --git a/rules/bridge-utils.in b/rules/bridge-utils.in index ba54531f0..6bce75468 100644 --- a/rules/bridge-utils.in +++ b/rules/bridge-utils.in @@ -1,12 +1,12 @@ # Bridge Utils configuration config BRIDGE_UTILS - bool + tristate # FIXME: # - claims about missing "missing" # - tries to pick up non-local include paths depends on BROKEN - prompt "Bridge Utils " + prompt "bridge utils " help Utilities for configuring the Linux ethernet bridge diff --git a/rules/busybox.in b/rules/busybox.in index 3f380599c..975bfb238 100644 --- a/rules/busybox.in +++ b/rules/busybox.in @@ -1,6 +1,6 @@ menuconfig BUSYBOX - bool - prompt "BusyBox " + tristate + prompt "busybox " select LIBC_M if BB_CONFIG_FEATURE_AWK_MATH help BusyBox is the Swiss Army Knife of embedded Linux. It is a diff --git a/rules/cairo.in b/rules/cairo.in index 72a5eff1e..535d84461 100644 --- a/rules/cairo.in +++ b/rules/cairo.in @@ -1,5 +1,5 @@ menuconfig CAIRO - bool + tristate select XORG_LIB_XT if CAIRO_XLIB && !GTK_TARGET_HOST_X11 select XORG_LIB_XRENDER if CAIRO_XLIB && !GTK_TARGET_HOST_X11 @@ -10,48 +10,45 @@ menuconfig CAIRO select LIBPNG if CAIRO_PNG - prompt "cairo " + prompt "cairo " help Cairo is a software library used to provide a vector graphics based, device-independent API for software developers. +if CAIRO + config CAIRO_PS bool - depends on CAIRO prompt "PostScript backend" config CAIRO_PDF bool - depends on CAIRO prompt "PDF backend" config CAIRO_XLIB bool - depends on CAIRO prompt "Xlib backend" select CAIRO_FREETYPE config CAIRO_DIRECTFB bool - depends on CAIRO prompt "directfb backend" select CAIRO_FREETYPE config CAIRO_WIN32 bool - depends on CAIRO prompt "Win32 backend" help Build cairo with the Win 32 backend. Makes only sense on mingw. config CAIRO_FREETYPE bool - depends on CAIRO prompt "Freetype font backend" config CAIRO_PNG bool - depends on CAIRO prompt "PNG support" + +endif diff --git a/rules/cairomm.in b/rules/cairomm.in index d354da1c1..86317aee3 100644 --- a/rules/cairomm.in +++ b/rules/cairomm.in @@ -1,7 +1,7 @@ config CAIROMM - bool + tristate select CAIRO - prompt "cairomm" + prompt "cairomm " help cairomm is a C++ wrapper for the cairo graphics library. It offers all the power of cairo with an interface familiar to C++ developers, diff --git a/rules/calibrator.in b/rules/calibrator.in index 25c8639c2..babaa1547 100644 --- a/rules/calibrator.in +++ b/rules/calibrator.in @@ -1,7 +1,7 @@ config CALIBRATOR - bool - prompt "calibrator" + tristate + prompt "calibrator " help The Calibrator is a Cache-Memory and TLB Calibration Tool diff --git a/rules/canutils.in b/rules/canutils.in index 555b64e44..11c293d7d 100644 --- a/rules/canutils.in +++ b/rules/canutils.in @@ -1,49 +1,47 @@ menuconfig CANUTILS - bool "canutils " + tristate + prompt "canutils " select KERNEL help The canutils package contains tools to configure and test the Socket CAN framework. +if CANUTILS + config CANUTILS_VERSION prompt "Version" - depends on CANUTILS string default "2.0.1" config CANUTILS_CANCONFIG bool - depends on CANUTILS prompt "canconfig" help Configuration Tool for socket can. config CANUTILS_CANDUMP bool - depends on CANUTILS prompt "candump" help A little utility to dump canbus messages config CANUTILS_CANECHO bool - depends on CANUTILS prompt "canecho" help A little utility to echo canbus messages config CANUTILS_CANSEND bool - depends on CANUTILS prompt "cansend" help A little utility to send canbus messages from command line config CANUTILS_CANSEQUENCE bool - depends on CANUTILS prompt "cansequence" help A little utility to send and verify canbus messages from command line with sequence numbers inside +endif diff --git a/rules/cfgsh.in b/rules/cfgsh.in index 8bde0993f..4e398c61e 100644 --- a/rules/cfgsh.in +++ b/rules/cfgsh.in @@ -1,9 +1,9 @@ menuconfig CFGSH - bool + tristate depends on BROKEN select NCURSES select READLINE - prompt "cfgsh [BROKEN] " + prompt "cfgsh [BROKEN] " help cfgsh, the Configuration Shell utility, is a small utility meant to be used for he configuration of embedded systems. diff --git a/rules/chrony.in b/rules/chrony.in index eff45eac7..caa65bc22 100644 --- a/rules/chrony.in +++ b/rules/chrony.in @@ -1,7 +1,8 @@ # chrony configuration menuconfig CHRONY - bool "Chrony " + tristate + prompt "chrony " select READLINE # FIXME: remove READLINE select when 1.21 works again. help @@ -17,11 +18,11 @@ menuconfig CHRONY See http://chrony.sunsite.dk/ for details +if CHRONY + comment "install options ---" - depends on CHRONY config CHRONY_INSTALL_CHRONY_COMMAND - depends on CHRONY bool default n prompt "Install chrony command helper" @@ -33,7 +34,6 @@ config CHRONY_INSTALL_CHRONY_COMMAND the chrony.keys file. config CHRONY_INSTALL_CHRONY_STAT - depends on CHRONY bool default n prompt "Install chrony statistics helper" @@ -57,10 +57,9 @@ config CHRONY_INSTALL_CHRONY_STAT suppress all other servers menuconfig CHRONY_INSTALL_CONFIG - depends on CHRONY bool default y - prompt "Install chrony config files" + prompt "Install chrony config files " help Install /etc/chrony/chrony.conf and /etc/chrony/chony.keys from a selectable source. @@ -87,7 +86,6 @@ menuconfig CHRONY_INSTALL_CONFIG endchoice config CHRONY_DEFAULT_ACCESS_KEY - depends on CHRONY string prompt "setup default access key for chronyc" default "undefined" @@ -98,7 +96,6 @@ config CHRONY_DEFAULT_ACCESS_KEY data, etc. config CHRONY_DEFAULT_NTP_SERVER - depends on CHRONY string prompt "setup default ntp peer" default "10.1.1.2" @@ -107,10 +104,9 @@ config CHRONY_DEFAULT_NTP_SERVER configurations. menuconfig ROOTFS_ETC_INITD_CHRONY - depends on CHRONY bool default y - prompt "Install startup script" + prompt "Install startup script " help The /etc/init.d/chrony script lets you control the chronyd daemon. @@ -134,3 +130,5 @@ menuconfig ROOTFS_ETC_INITD_CHRONY uses file projectroot/etc/init.d/chrony in your local project endchoice + +endif diff --git a/rules/clock.in b/rules/clock.in index ccf1348d5..4b5adeda6 100644 --- a/rules/clock.in +++ b/rules/clock.in @@ -1,7 +1,7 @@ config CLOCK - bool + tristate depends on BROKEN - prompt "clock [BROKEN]" + prompt "clock [BROKEN] " help This is clock, used on the Intel platforms to set the system from the real time clock, and vice versa. diff --git a/rules/commoncpp2.in b/rules/commoncpp2.in index 6f3cab16e..146395be3 100644 --- a/rules/commoncpp2.in +++ b/rules/commoncpp2.in @@ -1,10 +1,11 @@ # GNU commoncpp 2 configuration menuconfig COMMONCPP2 - bool - prompt "CommonC++ 2 " + tristate + prompt "commonc++ 2 " select ZLIB if COMMONCPP2_LIBZ select LIBXML2 if COMMONCPP2_LIBXML2 + select LIBXML2_PUSH if COMMONCPP2_LIBXML2 help GNU Common C++ is a portable and highly optimized class framework for writing C++ applications that need to use threads, @@ -14,14 +15,14 @@ menuconfig COMMONCPP2 http://www.gnu.org/software/commoncpp/ +if COMMONCPP2 + config COMMONCPP2_LIBZ bool prompt "enable libz compression" - depends on COMMONCPP2 config COMMONCPP2_LIBXML2 bool prompt "enable libxml2 parser" - depends on COMMONCPP2 - select LIBXML2_PUSH +endif diff --git a/rules/commoncpp2.make b/rules/commoncpp2.make index 59879ebbc..f7be2f81c 100644 --- a/rules/commoncpp2.make +++ b/rules/commoncpp2.make @@ -2,7 +2,7 @@ # $Id: template 3502 2005-12-11 12:46:17Z rsc $ # # Copyright (C) 2006 by Robert Schwebel -# +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -35,7 +35,7 @@ $(STATEDIR)/commoncpp2.get: $(commoncpp2_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) -$(COMMONCPP2_SOURCE): +$(COMMONCPP2_SOURCE): @$(call targetinfo, $@) @$(call get, COMMONCPP2) diff --git a/rules/coreutils.in b/rules/coreutils.in index 85038e810..d1697e37d 100644 --- a/rules/coreutils.in +++ b/rules/coreutils.in @@ -1,23 +1,24 @@ menuconfig COREUTILS - bool "GNU coreutils " + tristate + prompt "GNU coreutils " help This package contains some of the The GNU Core Utilities +if COREUTILS + config COREUTILS_CP bool prompt "cp" - depends on COREUTILS depends on !BB_CONFIG_CP help copy files and directories comment "busy box' cp is selected!" - depends on COREUTILS && BB_CONFIG_CP + depends BB_CONFIG_CP config COREUTILS_DD bool prompt "dd" - depends on COREUTILS depends on !BB_CONFIG_DD help convert and copy a file @@ -28,18 +29,16 @@ comment "busy box' dd is selected!" config COREUTILS_MD5SUM bool prompt "md5sum" - depends on COREUTILS depends on !BB_CONFIG_MD5SUM help compute and check MD5 message digest comment "busy box' md5sum is selected!" - depends on COREUTILS && BB_CONFIG_MD5SUM + depends BB_CONFIG_MD5SUM config COREUTILS_READLINK bool prompt "readlink" - depends on COREUTILS depends on !BB_CONFIG_READLINK help the readlink tool @@ -47,10 +46,11 @@ config COREUTILS_READLINK config COREUTILS_SEQ bool prompt "seq" - depends on COREUTILS depends on !BB_CONFIG_SEQ help print a sequence of numbers comment "busy box' seq is selected!" - depends on COREUTILS && BB_CONFIG_SEQ + depends BB_CONFIG_SEQ + +endif diff --git a/rules/cppunit.in b/rules/cppunit.in index a5cd555b8..233e0e01b 100644 --- a/rules/cppunit.in +++ b/rules/cppunit.in @@ -1,6 +1,6 @@ config CPPUNIT - bool - prompt "cppunit" + tristate + prompt "cppunit " help cppunit is a C++ port of JUnit. It is a testing framework. For more info, check: diff --git a/rules/cpufrequtils.in b/rules/cpufrequtils.in index 819afc685..2fb3bd8ef 100644 --- a/rules/cpufrequtils.in +++ b/rules/cpufrequtils.in @@ -1,6 +1,6 @@ menuconfig CPUFREQUTILS - bool - prompt "cpufrequtils " + tristate + prompt "cpufrequtils " select SYSFSUTILS select SYSFSUTILS_LIB help @@ -10,16 +10,18 @@ menuconfig CPUFREQUTILS Refer http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html This package requires the sysfsutils. +if CPUFREQUTILS + config CPUFREQUTILS_FREQ_INFO - depends on CPUFREQUTILS bool prompt "install cpufreq-info" help Command line tools to determine current CPUfreq setting config CPUFREQUTILS_FREQ_SET - depends on CPUFREQUTILS bool prompt "install cpufreq-info" help Command line tools to set current CPUfreq + +endif diff --git a/rules/cvs.in b/rules/cvs.in index d168e582e..1d0410cbe 100644 --- a/rules/cvs.in +++ b/rules/cvs.in @@ -1,7 +1,7 @@ # CVS client/server menuconfig CVS - bool + tristate default n # # cvs brings its own libz, but the current @@ -10,18 +10,18 @@ menuconfig CVS select ZLIB select LIBC_CRYPT select LIBC_NSL - prompt "cvs " + prompt "cvs " help CVS is the Concurrent Versions System. This is a version control system useful for projects using a central repository to hold files and then track all changes made to those files. +if CVS + comment "build options ---" - depends on CVS config CVS_NDBM bool - depends on CVS default y prompt "use built in ndbm" help @@ -30,7 +30,6 @@ config CVS_NDBM config CVS_CLIENT bool - depends on CVS default n prompt "Build cvs client" help @@ -38,7 +37,6 @@ config CVS_CLIENT config CVS_PSSWRD_CLIENT bool - depends on CVS depends on CVS_CLIENT default n prompt "Support password authenticated client" @@ -47,7 +45,6 @@ config CVS_PSSWRD_CLIENT config CVS_SERVER bool - depends on CVS default y prompt "Build cvs server" help @@ -55,7 +52,6 @@ config CVS_SERVER config CVS_FLOW_CONTROL bool - depends on CVS depends on CVS_SERVER default y prompt "Enable server flow control" @@ -67,7 +63,6 @@ config CVS_FLOW_CONTROL config CVS_ENCRYPTION bool - depends on CVS depends on CVS_SERVER default n prompt "Enable encryption" @@ -76,7 +71,6 @@ config CVS_ENCRYPTION config CVS_ROOTCOMMIT bool - depends on CVS depends on CVS_SERVER default n prompt "Allow root commits" @@ -84,11 +78,9 @@ config CVS_ROOTCOMMIT Allow the root user to commit files comment "install options ---" - depends on CVS config CVS_SERVER_POPULATE_CVSROOT bool - depends on CVS depends on CVS_SERVER prompt "Populate CVSROOT files" default n @@ -117,11 +109,9 @@ config CVS_SERVER_POPULATE_CVSROOT this feature do not leave "cvs' repository" entry empty! comment "runtime options ---" - depends on CVS config CVS_SERVER_REPOSITORY string - depends on CVS depends on CVS_SERVER prompt "cvs' repository" default "/srv/cvsroot" @@ -131,7 +121,6 @@ config CVS_SERVER_REPOSITORY choice prompt "Kind of startup" - depends on CVS depends on CVS_SERVER config CVS_INETD_SERVER @@ -157,7 +146,6 @@ endchoice config CVS_INETD_STRING string - depends on CVS depends on CVS_SERVER depends on CVS_INETD_SERVER prompt "inetd service entry" @@ -169,7 +157,6 @@ config CVS_INETD_STRING choice prompt "Kind of startup script" default ROOTFS_ETC_INITD_CVS_DEFAULT - depends on CVS depends on CVS_STARTUP_TYPE_STANDALONE config ROOTFS_ETC_INITD_CVS_DEFAULT @@ -188,3 +175,5 @@ choice project endchoice + +endif diff --git a/rules/cyclictest.in b/rules/cyclictest.in index 530330f9e..e928b4686 100644 --- a/rules/cyclictest.in +++ b/rules/cyclictest.in @@ -1,6 +1,6 @@ config CYCLICTEST - bool - prompt "cyclictest " + tristate + prompt "cyclictest " select LIBC_PTHREAD select LIBC_RT help |