diff options
| -rw-r--r-- | rules/gdb.in | 18 | ||||
| -rw-r--r-- | rules/gdbserver.in | 3 | ||||
| -rw-r--r-- | rules/glibc.in | 2 | ||||
| -rw-r--r-- | rules/libc.in | 4 | ||||
| -rw-r--r-- | rules/ntp.in | 4 | ||||
| -rw-r--r-- | rules/ntp_nonparse.in | 2 | ||||
| -rw-r--r-- | rules/ntp_parse.in | 2 | ||||
| -rw-r--r-- | rules/uclibc.in | 2 | ||||
| -rw-r--r-- | rules/xorg.in | 14 |
9 files changed, 21 insertions, 30 deletions
diff --git a/rules/gdb.in b/rules/gdb.in index 915fdaaf3..ddbaefd28 100644 --- a/rules/gdb.in +++ b/rules/gdb.in @@ -1,11 +1,5 @@ ## SECTION=debug_tools -menu "gdb " - -config GDB__VERSION - string "gdb version" - default 6.8 - menuconfig GDB tristate prompt "gdb (the real one) " @@ -14,17 +8,20 @@ menuconfig GDB if GDB +config GDB__VERSION + string "gdb version" + default 6.8 + config GDB__SHARED - bool "Build shared" + bool "build shared" default y select LIBC_M help If not set, the build option LDFLAGS=-static will be activated. - choice - prompt "Select term library" + prompt "select term library" default GDB__TERMCAP config GDB__TERMCAP @@ -51,6 +48,3 @@ endchoice endif -source "rules/gdbserver.in" - -endmenu diff --git a/rules/gdbserver.in b/rules/gdbserver.in index ad18c531d..d4a02ce56 100644 --- a/rules/gdbserver.in +++ b/rules/gdbserver.in @@ -1,3 +1,5 @@ +## SECTION=debug_tools + menuconfig GDBSERVER tristate prompt "gdbserver " @@ -17,3 +19,4 @@ config GDBSERVER__SHARED will be activated. endif + diff --git a/rules/glibc.in b/rules/glibc.in index a312350bd..dcbdee6e8 100644 --- a/rules/glibc.in +++ b/rules/glibc.in @@ -1,3 +1,5 @@ +## SECTION=libc_glibc + menu "glibc " config GLIBC_VERSION diff --git a/rules/libc.in b/rules/libc.in index e0da0e6b6..8d15d63de 100644 --- a/rules/libc.in +++ b/rules/libc.in @@ -19,11 +19,11 @@ choice endchoice if GLIBC -source "rules/glibc.in" +source "generated/libc_glibc.in" endif if UCLIBC -source "rules/uclibc.in" +source "generated/libc_uclibc.in" endif diff --git a/rules/ntp.in b/rules/ntp.in index f36ab9cff..d40c4d0cf 100644 --- a/rules/ntp.in +++ b/rules/ntp.in @@ -1,4 +1,5 @@ ## SECTION=networking + menuconfig NTP tristate # FIXME: @@ -169,8 +170,7 @@ config NTP_ARLIB endif -source "rules/ntp_parse.in" -source "rules/ntp_nonparse.in" +source "generated/networking_ntp.in" # ---------- Install Options diff --git a/rules/ntp_nonparse.in b/rules/ntp_nonparse.in index f12267428..2f47e3e65 100644 --- a/rules/ntp_nonparse.in +++ b/rules/ntp_nonparse.in @@ -1,3 +1,5 @@ +## SECTION=networking_ntp + # --- non-PARSE clocks --- menuconfig NTP_ALL_CLOCKS diff --git a/rules/ntp_parse.in b/rules/ntp_parse.in index 4b6c1ca27..b1f2b2abd 100644 --- a/rules/ntp_parse.in +++ b/rules/ntp_parse.in @@ -1,3 +1,5 @@ +## SECTION=networking_ntp + # --- PARSE clocks --- menuconfig NTP_PARSE_CLOCKS diff --git a/rules/uclibc.in b/rules/uclibc.in index aec165e32..b398f61c8 100644 --- a/rules/uclibc.in +++ b/rules/uclibc.in @@ -1,3 +1,5 @@ +## SECTION=libc_uclibc + menu "uClibc " config UCLIBC_VERSION diff --git a/rules/xorg.in b/rules/xorg.in deleted file mode 100644 index ebcf97ff8..000000000 --- a/rules/xorg.in +++ /dev/null @@ -1,14 +0,0 @@ -menuconfig XORG - bool - prompt "Xorg " - help - Enable this entry if you want the whole world of X. - -if XORG -source "rules/xorg-options.in" -source "rules/xorg-server.in" -source "generated/multimedia_xorg.in" -endif - -source "rules/xorg-font.in" - |