summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-16 05:12:28 (UTC)
committer kergoth <kergoth>2003-01-16 05:12:28 (UTC)
commitec2be2b453c0cb5df6b1eabbcdc1e899562bf5c2 (patch) (side-by-side diff)
treeca49caadf5e3629ec0be98a38ee1f47661977578
parentcc976ca7f032c892d3dadcaadf2225c8869a6612 (diff)
downloadopie-ec2be2b453c0cb5df6b1eabbcdc1e899562bf5c2.zip
opie-ec2be2b453c0cb5df6b1eabbcdc1e899562bf5c2.tar.gz
opie-ec2be2b453c0cb5df6b1eabbcdc1e899562bf5c2.tar.bz2
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.
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,59 +1,59 @@
#!/usr/bin/make -f
export OPIEDIR:=$(shell pwd)
export TOPDIR:=$(OPIEDIR)
export QMAKE:=$(OPIEDIR)/qmake/qmake
export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
noconfig_targets := xconfig menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig allmodconfig
-configs += $(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
+configs += $(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
# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
# in order to have a full set of config.in files.
# .depends depends on $(TOPDIR)/.config
# everything else depends on .depends, to ensure the dependencies are
# intact.
#
# NOTE: The order in which things happen in this makefile is
# -critical-. Do not rearrange this!
all : $(TOPDIR)/.config
$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
clean-configs : $(TOPDIR)/.depends.cfgs
@echo "Wiping generated config.in files..."
@-rm -f $(configs)
-include $(TOPDIR)/.depends.cfgs
all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
$(call descend,scripts/kconfig,conf)
@if [ ! -e $@ ]; then \
cp $(TOPDIR)/def-configs/opie $@; \
fi;
@$(MAKE) -C scripts/kconfig conf;
./scripts/kconfig/conf -s ./config.in
# config rules must have the $(configs) var defined
# at the time that they run. we must ensure that .depends.cfgs
# is built and included by the time we reach this point.
xconfig :
$(call descend,scripts/kconfig,qconf)
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
./scripts/kconfig/qconf ./config.in
menuconfig : scripts/lxdialog/lxdialog
$(call descend,scripts/kconfig,mconf)
./scripts/kconfig/mconf ./config.in
config :
$(call descend,scripts/kconfig,conf)
./scripts/kconfig/conf ./config.in
diff --git a/config.in b/config.in
index 9f89b74..50e26f1 100644
--- a/config.in
+++ b/config.in
@@ -25,65 +25,111 @@ choice
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
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 @@
config BATTERYAPPLET
- boolean "batteryapplet"
+ boolean "Battery (Applet to monitor battery status)"
default "y"
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 @@
config CARDMON
- boolean "cardmon"
+ boolean "Cardmon (monitor cf/sd/mmc card status, and eject function)"
default "y"
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 @@
config CLIPBOARDAPPLET
- boolean "clipboardapplet"
+ boolean "Clipboard (copy/cut/paste applet)"
default "y"
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 @@
config CLOCKAPPLET
- boolean "clockapplet"
+ boolean "Clock (Digital clock applet)"
default "y"
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 @@
config HOMEAPPLET
- boolean "homeapplet"
+ boolean "Home"
default "y"
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 @@
config IRDAAPPLET
- boolean "irdaapplet"
+ boolean "Irda (applet for IR beaming/discovery)"
default "y"
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 @@
config LOGOUTAPPLET
- boolean "logoutapplet"
+ boolean "Logout"
default "y"
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 @@
config OBEX
- boolean "obex"
+ boolean "Obex library (library needed for beaming in Opie)"
default "y"
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 @@
config RESTARTAPPLET
- boolean "restartapplet"
+ boolean "Restart"
default "y"
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 @@
config SCREENSHOTAPPLET
- boolean "screenshotapplet"
+ boolean "Screenshot"
default "y"
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 @@
config SUSPENDAPPLET
- boolean "suspendapplet"
+ boolean "Suspend"
default "y"
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 @@
config VMEMO
- boolean "vmemo"
+ boolean "Vmemo (take voice memos)"
default "y"
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 @@
config VOLUMEAPPLET
- boolean "volumeapplet"
+ boolean "Volume"
default "y"
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 @@
-menu "Core"
-@sources@
-endmenu
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 @@
-menu "today"
-
config TODAY
boolean "today"
default "y"
depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
- source core/pim/today/plugins/config.in
-endmenu
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 @@
config NOTESAPPLET
- boolean "notesapplet"
+ boolean "Notes (quick note taking applet)"
default "y"
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 @@
config WIRELESSAPPLET
- boolean "wirelessapplet"
+ boolean "Wireless (view wireless signal strength, and renew IP on AP change)"
default "y"
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 @@
-menu "opie-console"
-
- config #OPIE-CONSOLE
+ config OPIE-CONSOLE
boolean "opie-console"
default "y"
depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
- source noncore/apps/opie-console/test/config.in
-endmenu
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 @@
-# config #OPIE-WRITE
-# boolean "opie-write"
-# default "y"
-# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ config OPIE-WRITE
+ boolean "opie-write"
+ default "y"
+ 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 @@
-# config #MOBILEMSG
-# boolean "mobilemsg"
-# default "y"
-# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ config MOBILEMSG
+ boolean "mobilemsg"
+ default "y"
+ 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 @@
-menu "Non-core"
-@sources@
-endmenu
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 @@
-# config #CHESS
-# boolean "chess"
-# default "y"
-# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ config CHESS
+ boolean "chess"
+ default "n"
+ 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 @@
-# config #OPIEPLAYER2
-# boolean "opieplayer2"
-# default "y"
-# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ config OPIEPLAYER2
+ boolean "opieplayer2"
+ default "n"
+ 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 @@
-# config #UBROWSER
-# boolean "ubrowser"
-# default "y"
-# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ config UBROWSER
+ boolean "ubrowser"
+ default "n"
+ 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 @@
config APPEARANCE2
- boolean "appearance2"
+ boolean "Appearance"
default "y"
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 @@
-menu "stockticker"
-
config TODAY_STOCKTICKER
boolean "stockticker"
default "y"
depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
source noncore/todayplugins/stockticker/stockticker/config.in
source noncore/todayplugins/stockticker/stocktickerlib/config.in
-endmenu
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 @@
-# config #GSMTOOL
-# boolean "gsmtool"
-# default "y"
-# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ config GSMTOOL
+ boolean "gsmtool"
+ default "y"
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE