Move most of config categorization into root config, and consolated core vs noncore from a config perspective, as its confusing and unnecessary for users. Also cleaned up a bit, and added some basic descriptions.

1 files changed, 53 insertions, 7 deletions

diff --git a/config.in b/config.in
index 9f89b74..50e26f1 100644
--- a/config.in
+++ b/config.in
@@ -1,89 +1,135 @@
 mainmenu "Opie Configuration"
 menu "Build Parameters"
 
 #choice
 # prompt "Build Processor family"
 #  default BUILD_X86
 #  help
 #    Please select the architecture of the machine you will be
 #    building the OpenZaurus buildroot on.
 #
 #  config BUILD_X86
 #    boolean "X86 Architecture"
 #
 #endchoice
 
 choice
   prompt "Target Machine"
   default TARGET_X86
   help
     Please select the architecture of the machine you will be
     building the OpenZaurus buildroot for.
 
   config TARGET_X86
     boolean "Intel X86"
 
   config TARGET_SHARP
     boolean "Sharp Zaurus SL-5x00 - stock"
 
 #  config TARGET_OZ
 #    boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
 
   config TARGET_IPAQ
     boolean "Ipaq"
 
 endchoice
 
 config OPTIMIZE
   boolean "Use optimizations"
   default "y" if ! TARGET_X86
 
 config SPECFILE
   string
   default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
   default "linux-g++" if TARGET_X86 && X11
   default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
   default "linux-g++" if TARGET_SHARP && X11
 #  default "linux-oz-g++" if TARGET_OZ
   default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
   default "linux-g++" if TARGET_IPAQ && X11
 
 config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
   
 
 config OPTIMIZATIONS
   string "Optimization flags"
   depends OPTIMIZE
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
 
 #config CROSS
 #  string "Crosscompilation prefix"
 #  default "arm-linux-"
 #  help
 #    Crosscompilation prefix is the prefix which will be prepended
 #    to all compilation commands. For example, a crosscompilation prefix
 #    of arm-linux-, results in the build calling arm-linux-gcc as its CC.
 
 endmenu
 
-menu "Libraries"
+menu "Base"
   choice
     prompt "Qpe Library Selection"
     default LIBQPE
     
     source library/config.in
     source x11/config.in
   endchoice
   source libopie/config.in
-  source freetype/config.in
+  source core/opie-login/config.in
+  source core/opiealarm/config.in
+  source core/launcher/config.in
 endmenu
 
-source inputmethods/config.in
-source core/config.in
-source noncore/config.in
-source development/config.in
-source quickexec/config.in
+comment ""
+
+menu "Applets"
+  source core/applets/config.in
+  source noncore/applets/config.in
+endmenu
+menu "Apps"
+  source core/apps/config.in
+  source noncore/apps/config.in
+endmenu
+menu "Communications and Networking"
+  source noncore/comm/config.in
+  source noncore/mail/config.in
+  source noncore/net/config.in
+endmenu
+menu "Games"
+  source noncore/games/config.in
+endmenu
+menu "Graphics and Multimedia"
+  source freetype/config.in
+  source noncore/graphics/config.in
+  source core/multimedia/config.in
+  source noncore/multimedia/config.in
+endmenu
+menu "Input methods"
+  source inputmethods/config.in
+endmenu
+menu "Pim"
+  source core/pim/config.in
+  menu "Today Plugins"
+    source noncore/todayplugins/config.in
+    source core/pim/today/plugins/config.in
+  endmenu
+endmenu
+menu "Settings"
+  source core/settings/config.in
+  source noncore/settings/config.in
+endmenu
+menu "Theming"
+  source noncore/decorations/config.in
+  source noncore/styles/config.in
+endmenu
+menu "Tools"
+  source noncore/tools/config.in
+  source development/config.in
+endmenu
+menu "Unsupported"
+  source noncore/unsupported/config.in
+endmenu