summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test2
-rw-r--r--config.in60
-rw-r--r--core/applets/batteryapplet/config.in2
-rw-r--r--core/applets/cardmon/config.in2
-rw-r--r--core/applets/clipboardapplet/config.in2
-rw-r--r--core/applets/clockapplet/config.in2
-rw-r--r--core/applets/homeapplet/config.in2
-rw-r--r--core/applets/irdaapplet/config.in2
-rw-r--r--core/applets/logoutapplet/config.in2
-rw-r--r--core/applets/obex/config.in2
-rw-r--r--core/applets/restartapplet/config.in2
-rw-r--r--core/applets/screenshotapplet/config.in2
-rw-r--r--core/applets/suspendapplet/config.in2
-rw-r--r--core/applets/vmemo/config.in2
-rw-r--r--core/applets/volumeapplet/config.in2
-rw-r--r--core/config.in.in3
-rw-r--r--core/pim/today/config.in4
-rw-r--r--noncore/applets/notesapplet/config.in2
-rw-r--r--noncore/applets/wirelessapplet/config.in2
-rw-r--r--noncore/apps/opie-console/config.in6
-rw-r--r--noncore/apps/opie-write/config.in8
-rw-r--r--noncore/comm/mobilemsg/config.in8
-rw-r--r--noncore/config.in.in3
-rw-r--r--noncore/games/chess/config.in8
-rw-r--r--noncore/multimedia/opieplayer2/config.in8
-rw-r--r--noncore/net/ubrowser/config.in8
-rw-r--r--noncore/settings/appearance2/config.in2
-rw-r--r--noncore/todayplugins/stockticker/config.in3
-rw-r--r--noncore/unsupported/gsmtool/config.in8
29 files changed, 95 insertions, 66 deletions
diff --git a/Makefile.test b/Makefile.test
index 15cd128..8418158 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,35 +1,35 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2export OPIEDIR:=$(shell pwd) 2export OPIEDIR:=$(shell pwd)
3export TOPDIR:=$(OPIEDIR) 3export TOPDIR:=$(OPIEDIR)
4export QMAKE:=$(OPIEDIR)/qmake/qmake 4export QMAKE:=$(OPIEDIR)/qmake/qmake
5 5
6export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 6export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
7 7
8noconfig_targets := xconfig menuconfig config oldconfig randconfig \ 8noconfig_targets := xconfig menuconfig config oldconfig randconfig \
9 defconfig allyesconfig allnoconfig allmodconfig 9 defconfig allyesconfig allnoconfig allmodconfig
10 10
11configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in 11configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in
12 12
13# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) 13# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
14# in order to have a full set of config.in files. 14# in order to have a full set of config.in files.
15# .depends depends on $(TOPDIR)/.config 15# .depends depends on $(TOPDIR)/.config
16# everything else depends on .depends, to ensure the dependencies are 16# everything else depends on .depends, to ensure the dependencies are
17# intact. 17# intact.
18# 18#
19# NOTE: The order in which things happen in this makefile is 19# NOTE: The order in which things happen in this makefile is
20 # -critical-. Do not rearrange this! 20 # -critical-. Do not rearrange this!
21 21
22all : $(TOPDIR)/.config 22all : $(TOPDIR)/.config
23 23
24$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 24$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
25 25
26all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 26all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
27 27
28clean-configs : $(TOPDIR)/.depends.cfgs 28clean-configs : $(TOPDIR)/.depends.cfgs
29 @echo "Wiping generated config.in files..." 29 @echo "Wiping generated config.in files..."
30 @-rm -f $(configs) 30 @-rm -f $(configs)
31 31
32-include $(TOPDIR)/.depends.cfgs 32-include $(TOPDIR)/.depends.cfgs
33 33
34all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 34all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
35 35
diff --git a/config.in b/config.in
index 9f89b74..50e26f1 100644
--- a/config.in
+++ b/config.in
@@ -49,41 +49,87 @@ config SPECFILE
49 default "linux-g++" if TARGET_IPAQ && X11 49 default "linux-g++" if TARGET_IPAQ && X11
50 50
51config CUSTOMFILE 51config CUSTOMFILE
52 string 52 string
53 default "custom-ipaq.h" if TARGET_IPAQ 53 default "custom-ipaq.h" if TARGET_IPAQ
54 default "custom-sharp.h" if TARGET_SHARP 54 default "custom-sharp.h" if TARGET_SHARP
55 55
56 56
57config OPTIMIZATIONS 57config OPTIMIZATIONS
58 string "Optimization flags" 58 string "Optimization flags"
59 depends OPTIMIZE 59 depends OPTIMIZE
60 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ 60 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
61 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP 61 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
62 62
63#config CROSS 63#config CROSS
64# string "Crosscompilation prefix" 64# string "Crosscompilation prefix"
65# default "arm-linux-" 65# default "arm-linux-"
66# help 66# help
67# Crosscompilation prefix is the prefix which will be prepended 67# Crosscompilation prefix is the prefix which will be prepended
68# to all compilation commands. For example, a crosscompilation prefix 68# to all compilation commands. For example, a crosscompilation prefix
69# of arm-linux-, results in the build calling arm-linux-gcc as its CC. 69# of arm-linux-, results in the build calling arm-linux-gcc as its CC.
70 70
71endmenu 71endmenu
72 72
73menu "Libraries" 73menu "Base"
74 choice 74 choice
75 prompt "Qpe Library Selection" 75 prompt "Qpe Library Selection"
76 default LIBQPE 76 default LIBQPE
77 77
78 source library/config.in 78 source library/config.in
79 source x11/config.in 79 source x11/config.in
80 endchoice 80 endchoice
81 source libopie/config.in 81 source libopie/config.in
82 source freetype/config.in 82 source core/opie-login/config.in
83 source core/opiealarm/config.in
84 source core/launcher/config.in
83endmenu 85endmenu
84 86
85source inputmethods/config.in 87comment ""
86source core/config.in 88
87source noncore/config.in 89menu "Applets"
88source development/config.in 90 source core/applets/config.in
89source quickexec/config.in 91 source noncore/applets/config.in
92endmenu
93menu "Apps"
94 source core/apps/config.in
95 source noncore/apps/config.in
96endmenu
97menu "Communications and Networking"
98 source noncore/comm/config.in
99 source noncore/mail/config.in
100 source noncore/net/config.in
101endmenu
102menu "Games"
103 source noncore/games/config.in
104endmenu
105menu "Graphics and Multimedia"
106 source freetype/config.in
107 source noncore/graphics/config.in
108 source core/multimedia/config.in
109 source noncore/multimedia/config.in
110endmenu
111menu "Input methods"
112 source inputmethods/config.in
113endmenu
114menu "Pim"
115 source core/pim/config.in
116 menu "Today Plugins"
117 source noncore/todayplugins/config.in
118 source core/pim/today/plugins/config.in
119 endmenu
120endmenu
121menu "Settings"
122 source core/settings/config.in
123 source noncore/settings/config.in
124endmenu
125menu "Theming"
126 source noncore/decorations/config.in
127 source noncore/styles/config.in
128endmenu
129menu "Tools"
130 source noncore/tools/config.in
131 source development/config.in
132endmenu
133menu "Unsupported"
134 source noncore/unsupported/config.in
135endmenu
diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in
index 5c3b591..611ba50 100644
--- a/core/applets/batteryapplet/config.in
+++ b/core/applets/batteryapplet/config.in
@@ -1,4 +1,4 @@
1 config BATTERYAPPLET 1 config BATTERYAPPLET
2 boolean "batteryapplet" 2 boolean "Battery (Applet to monitor battery status)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TARGET_SHARP 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TARGET_SHARP
diff --git a/core/applets/cardmon/config.in b/core/applets/cardmon/config.in
index 328b2e1..89cfc22 100644
--- a/core/applets/cardmon/config.in
+++ b/core/applets/cardmon/config.in
@@ -1,4 +1,4 @@
1 config CARDMON 1 config CARDMON
2 boolean "cardmon" 2 boolean "Cardmon (monitor cf/sd/mmc card status, and eject function)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/clipboardapplet/config.in b/core/applets/clipboardapplet/config.in
index 0b69fe0..44132c7 100644
--- a/core/applets/clipboardapplet/config.in
+++ b/core/applets/clipboardapplet/config.in
@@ -1,4 +1,4 @@
1 config CLIPBOARDAPPLET 1 config CLIPBOARDAPPLET
2 boolean "clipboardapplet" 2 boolean "Clipboard (copy/cut/paste applet)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in
index 3ca12fe..b810afe 100644
--- a/core/applets/clockapplet/config.in
+++ b/core/applets/clockapplet/config.in
@@ -1,4 +1,4 @@
1 config CLOCKAPPLET 1 config CLOCKAPPLET
2 boolean "clockapplet" 2 boolean "Clock (Digital clock applet)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/homeapplet/config.in b/core/applets/homeapplet/config.in
index feb8097..1828da0 100644
--- a/core/applets/homeapplet/config.in
+++ b/core/applets/homeapplet/config.in
@@ -1,4 +1,4 @@
1 config HOMEAPPLET 1 config HOMEAPPLET
2 boolean "homeapplet" 2 boolean "Home"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in
index 0b2fc51..5f90c65 100644
--- a/core/applets/irdaapplet/config.in
+++ b/core/applets/irdaapplet/config.in
@@ -1,4 +1,4 @@
1 config IRDAAPPLET 1 config IRDAAPPLET
2 boolean "irdaapplet" 2 boolean "Irda (applet for IR beaming/discovery)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/logoutapplet/config.in b/core/applets/logoutapplet/config.in
index 3dc0408..385b02f 100644
--- a/core/applets/logoutapplet/config.in
+++ b/core/applets/logoutapplet/config.in
@@ -1,4 +1,4 @@
1 config LOGOUTAPPLET 1 config LOGOUTAPPLET
2 boolean "logoutapplet" 2 boolean "Logout"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/obex/config.in b/core/applets/obex/config.in
index 33771db..4d1f43d 100644
--- a/core/applets/obex/config.in
+++ b/core/applets/obex/config.in
@@ -1,4 +1,4 @@
1 config OBEX 1 config OBEX
2 boolean "obex" 2 boolean "Obex library (library needed for beaming in Opie)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/restartapplet/config.in b/core/applets/restartapplet/config.in
index 0fa991d..79ec658 100644
--- a/core/applets/restartapplet/config.in
+++ b/core/applets/restartapplet/config.in
@@ -1,4 +1,4 @@
1 config RESTARTAPPLET 1 config RESTARTAPPLET
2 boolean "restartapplet" 2 boolean "Restart"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/screenshotapplet/config.in b/core/applets/screenshotapplet/config.in
index 94e2b84..f65c7f5 100644
--- a/core/applets/screenshotapplet/config.in
+++ b/core/applets/screenshotapplet/config.in
@@ -1,4 +1,4 @@
1 config SCREENSHOTAPPLET 1 config SCREENSHOTAPPLET
2 boolean "screenshotapplet" 2 boolean "Screenshot"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/suspendapplet/config.in b/core/applets/suspendapplet/config.in
index 4d3c42d..fdbe8b3 100644
--- a/core/applets/suspendapplet/config.in
+++ b/core/applets/suspendapplet/config.in
@@ -1,4 +1,4 @@
1 config SUSPENDAPPLET 1 config SUSPENDAPPLET
2 boolean "suspendapplet" 2 boolean "Suspend"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/vmemo/config.in b/core/applets/vmemo/config.in
index bcf02f2..b9a92db 100644
--- a/core/applets/vmemo/config.in
+++ b/core/applets/vmemo/config.in
@@ -1,4 +1,4 @@
1 config VMEMO 1 config VMEMO
2 boolean "vmemo" 2 boolean "Vmemo (take voice memos)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in
index f65faeb..6033422 100644
--- a/core/applets/volumeapplet/config.in
+++ b/core/applets/volumeapplet/config.in
@@ -1,4 +1,4 @@
1 config VOLUMEAPPLET 1 config VOLUMEAPPLET
2 boolean "volumeapplet" 2 boolean "Volume"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/config.in.in b/core/config.in.in
deleted file mode 100644
index 6689eaf..0000000
--- a/core/config.in.in
+++ b/dev/null
@@ -1,3 +0,0 @@
1menu "Core"
2@sources@
3endmenu
diff --git a/core/pim/today/config.in b/core/pim/today/config.in
index 6bcdbe2..2cb97db 100644
--- a/core/pim/today/config.in
+++ b/core/pim/today/config.in
@@ -1,8 +1,4 @@
1menu "today"
2
3 config TODAY 1 config TODAY
4 boolean "today" 2 boolean "today"
5 default "y" 3 default "y"
6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7 source core/pim/today/plugins/config.in
8endmenu
diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in
index 6a90f19..9f13d55 100644
--- a/noncore/applets/notesapplet/config.in
+++ b/noncore/applets/notesapplet/config.in
@@ -1,4 +1,4 @@
1 config NOTESAPPLET 1 config NOTESAPPLET
2 boolean "notesapplet" 2 boolean "Notes (quick note taking applet)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/applets/wirelessapplet/config.in b/noncore/applets/wirelessapplet/config.in
index e502f93..c201bab 100644
--- a/noncore/applets/wirelessapplet/config.in
+++ b/noncore/applets/wirelessapplet/config.in
@@ -1,4 +1,4 @@
1 config WIRELESSAPPLET 1 config WIRELESSAPPLET
2 boolean "wirelessapplet" 2 boolean "Wireless (view wireless signal strength, and renew IP on AP change)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/opie-console/config.in b/noncore/apps/opie-console/config.in
index 845ae85..fabc81d 100644
--- a/noncore/apps/opie-console/config.in
+++ b/noncore/apps/opie-console/config.in
@@ -1,8 +1,4 @@
1menu "opie-console" 1 config OPIE-CONSOLE
2
3 config #OPIE-CONSOLE
4 boolean "opie-console" 2 boolean "opie-console"
5 default "y" 3 default "y"
6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7 source noncore/apps/opie-console/test/config.in
8endmenu
diff --git a/noncore/apps/opie-write/config.in b/noncore/apps/opie-write/config.in
index 9842b4b..5e736f1 100644
--- a/noncore/apps/opie-write/config.in
+++ b/noncore/apps/opie-write/config.in
@@ -1,4 +1,4 @@
1# config #OPIE-WRITE 1 config OPIE-WRITE
2# boolean "opie-write" 2 boolean "opie-write"
3# default "y" 3 default "y"
4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/comm/mobilemsg/config.in b/noncore/comm/mobilemsg/config.in
index 45c4ca4..524e254 100644
--- a/noncore/comm/mobilemsg/config.in
+++ b/noncore/comm/mobilemsg/config.in
@@ -1,4 +1,4 @@
1# config #MOBILEMSG 1 config MOBILEMSG
2# boolean "mobilemsg" 2 boolean "mobilemsg"
3# default "y" 3 default "y"
4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/config.in.in b/noncore/config.in.in
deleted file mode 100644
index 07e5743..0000000
--- a/noncore/config.in.in
+++ b/dev/null
@@ -1,3 +0,0 @@
1menu "Non-core"
2@sources@
3endmenu
diff --git a/noncore/games/chess/config.in b/noncore/games/chess/config.in
index 6cddb51..6d49f3e 100644
--- a/noncore/games/chess/config.in
+++ b/noncore/games/chess/config.in
@@ -1,4 +1,4 @@
1# config #CHESS 1 config CHESS
2# boolean "chess" 2 boolean "chess"
3# default "y" 3 default "n"
4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/multimedia/opieplayer2/config.in b/noncore/multimedia/opieplayer2/config.in
index da0a647..2272a9b 100644
--- a/noncore/multimedia/opieplayer2/config.in
+++ b/noncore/multimedia/opieplayer2/config.in
@@ -1,4 +1,4 @@
1# config #OPIEPLAYER2 1 config OPIEPLAYER2
2# boolean "opieplayer2" 2 boolean "opieplayer2"
3# default "y" 3 default "n"
4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/ubrowser/config.in b/noncore/net/ubrowser/config.in
index 562741d..3fb5c37 100644
--- a/noncore/net/ubrowser/config.in
+++ b/noncore/net/ubrowser/config.in
@@ -1,4 +1,4 @@
1# config #UBROWSER 1 config UBROWSER
2# boolean "ubrowser" 2 boolean "ubrowser"
3# default "y" 3 default "n"
4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/appearance2/config.in b/noncore/settings/appearance2/config.in
index 0da6502..2312610 100644
--- a/noncore/settings/appearance2/config.in
+++ b/noncore/settings/appearance2/config.in
@@ -1,4 +1,4 @@
1 config APPEARANCE2 1 config APPEARANCE2
2 boolean "appearance2" 2 boolean "Appearance"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in
index 036b04c..0186c44 100644
--- a/noncore/todayplugins/stockticker/config.in
+++ b/noncore/todayplugins/stockticker/config.in
@@ -1,10 +1,7 @@
1menu "stockticker"
2
3 config TODAY_STOCKTICKER 1 config TODAY_STOCKTICKER
4 boolean "stockticker" 2 boolean "stockticker"
5 default "y" 3 default "y"
6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7 5
8 source noncore/todayplugins/stockticker/stockticker/config.in 6 source noncore/todayplugins/stockticker/stockticker/config.in
9 source noncore/todayplugins/stockticker/stocktickerlib/config.in 7 source noncore/todayplugins/stockticker/stocktickerlib/config.in
10endmenu
diff --git a/noncore/unsupported/gsmtool/config.in b/noncore/unsupported/gsmtool/config.in
index f023d61..bb7a052 100644
--- a/noncore/unsupported/gsmtool/config.in
+++ b/noncore/unsupported/gsmtool/config.in
@@ -1,4 +1,4 @@
1# config #GSMTOOL 1 config GSMTOOL
2# boolean "gsmtool" 2 boolean "gsmtool"
3# default "y" 3 default "y"
4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE