summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-03-24 00:09:29 (UTC)
committer mickeyl <mickeyl>2004-03-24 00:09:29 (UTC)
commitf08adf125dbaa2a411fad9fba22443c7364afca3 (patch) (side-by-side diff)
tree5ef23b3d417d05dd0f9b649f7a7a70c60dd24c5f
parentdbde00826e485c509471961a15f95395a81b3b72 (diff)
downloadopie-f08adf125dbaa2a411fad9fba22443c7364afca3.zip
opie-f08adf125dbaa2a411fad9fba22443c7364afca3.tar.gz
opie-f08adf125dbaa2a411fad9fba22443c7364afca3.tar.bz2
reorder menu entries
libopie2: no longer a submenu, out of experimental, into base
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--config.in8
-rw-r--r--libopie/config.in4
-rw-r--r--libopie2/config.in7
3 files changed, 11 insertions, 8 deletions
diff --git a/config.in b/config.in
index 1a5b53b..e0255d6 100644
--- a/config.in
+++ b/config.in
@@ -129,53 +129,56 @@ config OPIE_NEW_ALLOC
boolean "Use malloc and free for the implementation"
default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
default n
config OPIE_NO_SOUND_PCM_READ_BITS
boolean "There is not a pcm_read_bits io control"
default y if TARGET_SHARP
default n
config OPIE_WE_VERSION
string "The wireless extension (WE) version to build against"
default "15" if ! TARGET_X86
default "16" if TAGET_X86
endmenu
menu "Base"
choice
prompt "Qpe Library Selection"
default LIBQPE
source library/config.in
source x11/config.in
endchoice
source libopie/config.in
+
+ source libopie2/config.in
+ source libqtaux/config.in
+
source core/opie-login/config.in
source core/opiealarm/config.in
source core/tools/quicklauncher/config.in
source core/launcher/config.in
- source core/qws/config.in
source core/symlinker/config.in
endmenu
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/net/config.in
endmenu
menu "Games"
source noncore/games/config.in
endmenu
@@ -212,44 +215,43 @@ menu "Tools"
source noncore/tools/config.in
endmenu
menu "Development"
source development/keyview/config.in
#source development/debugviewer/config.in
endmenu
menu "Examples"
config EXAMPLES
boolean "Compile Example Application"
source examples/config.in
endmenu
comment ""
menu "Unsupported / Unmaintained"
source noncore/unsupported/config.in
endmenu
comment ""
depends on EXPERIMENTAL
menu "Experimental"
depends on EXPERIMENTAL
- source libopie2/config.in
- source libqtaux/config.in
source libslcompat/config.in
+ source core/qws/config.in
config SQL_PIM_BACKEND
bool "Add SQL-Backend support"
default n
help
This adds the SQL-Support, using SQLite. Which database is used
by the backends is defined by the file "pimaccess.conf" in the
directory "Settings".
There currently do exist to groups "[contact]" and "[todo]". You can
select the used backend by the variable "usebackend=<type>", where
<type> is "sql" or "xml". "xml" is the default !
Important: The SQLite-library "libsqlite.so" must be installed !
depends ( LIBOPIE2DB )
comment "SQL-Support needs libopie2db!"
depends !( LIBOPIE2DB )
endmenu
diff --git a/libopie/config.in b/libopie/config.in
index 3dcae4d..945a5c3 100644
--- a/libopie/config.in
+++ b/libopie/config.in
@@ -1,4 +1,4 @@
config LIBOPIE
- boolean "Opie library"
- default "y"
+ boolean "libopie1 (compatibility only, use libopie2* for new applications)"
+ default "n"
depends LIBQPE || LIBQPE-X11 || LIBOPIE2DB
diff --git a/libopie2/config.in b/libopie2/config.in
index 5a0e443..ddbe807 100644
--- a/libopie2/config.in
+++ b/libopie2/config.in
@@ -1,11 +1,12 @@
-menu "libopie2"
+#menu "libopie2"
+ comment ""
source libopie2/opiecore/config.in
source libopie2/opiedb/config.in
source libopie2/opienet/config.in
source libopie2/opiepim/config.in
source libopie2/opieui/config.in
source libopie2/opiemm/config.in
- comment ""
source libopie2/examples/config.in
-endmenu
+ comment ""
+#endmenu