Make qt/x11 vs qt/e selection a proper 'choice' in the config system.

3 files changed, 91 insertions, 6 deletions

diff --git a/config.in b/config.in
new file mode 100644
index 0000000..9f89b74
--- a/dev/null
+++ b/config.in
@@ -0,0 +1,89 @@
+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"
+  choice
+    prompt "Qpe Library Selection"
+    default LIBQPE
+    
+    source library/config.in
+    source x11/config.in
+  endchoice
+  source libopie/config.in
+  source freetype/config.in
+endmenu
+
+source inputmethods/config.in
+source core/config.in
+source noncore/config.in
+source development/config.in
+source quickexec/config.in
diff --git a/library/config.in b/library/config.in
index e87d1d2..ea69ccb 100644
--- a/library/config.in
+++ b/library/config.in
@@ -1,5 +1,2 @@
 config LIBQPE
-  boolean "Qpe library"
-  default "y" if ! X11
-  default "n" if X11
-  depends on ! X11
+  boolean "Qpe Library (Qt/Embedded version)"
diff --git a/x11/config.in b/x11/config.in
index 6c49888..4eab192 100644
--- a/x11/config.in
+++ b/x11/config.in
@@ -1,6 +1,5 @@
   config X11
-    boolean "X11"
-    default "n"
+    boolean "Qpe Library (Qt/X11 version)"
 
   source x11/libqpe-x11/config.in
   source x11/ipc/server/config.in