summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--config.in17
-rw-r--r--core/launcher/config.in2
-rw-r--r--core/multimedia/opieplayer/config.in6
-rw-r--r--core/multimedia/opieplayer/libmad/config.in4
-rw-r--r--core/multimedia/opieplayer/libmpeg3/config.in4
-rw-r--r--core/multimedia/opieplayer/modplug/config.in4
-rw-r--r--core/multimedia/opieplayer/wavplugin/config.in2
-rw-r--r--core/opie-login/config.in2
8 files changed, 25 insertions, 16 deletions
diff --git a/config.in b/config.in
index 50e26f1..8559e73 100644
--- a/config.in
+++ b/config.in
@@ -85,16 +85,30 @@ menu "Base"
endmenu
comment ""
+#config APPLETS
+# bool "Applets"
+# default "y"
+
menu "Applets"
+# depends APPLETS
+
source core/applets/config.in
source noncore/applets/config.in
endmenu
+
+#config APPS
+# bool "Apps"
+# default "y"
+
menu "Apps"
+# depends 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
@@ -129,7 +143,4 @@ 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/launcher/config.in b/core/launcher/config.in
index 1917fd0..5405cc2 100644
--- a/core/launcher/config.in
+++ b/core/launcher/config.in
@@ -1,6 +1,6 @@
config LAUNCHER
- boolean "launcher"
+ boolean "Launcher"
default "y"
depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
if LAUNCHER
diff --git a/core/multimedia/opieplayer/config.in b/core/multimedia/opieplayer/config.in
index 5b6fca5..e63d9ec 100644
--- a/core/multimedia/opieplayer/config.in
+++ b/core/multimedia/opieplayer/config.in
@@ -1,12 +1,10 @@
-menu "opieplayer"
-
config OPIEPLAYER
- boolean "opieplayer"
+ boolean "Opieplayer"
default "y"
depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+
source core/multimedia/opieplayer/libflash/config.in
source core/multimedia/opieplayer/libmad/config.in
source core/multimedia/opieplayer/libmpeg3/config.in
source core/multimedia/opieplayer/modplug/config.in
source core/multimedia/opieplayer/wavplugin/config.in
-endmenu
diff --git a/core/multimedia/opieplayer/libmad/config.in b/core/multimedia/opieplayer/libmad/config.in
index 03354b6..1239166 100644
--- a/core/multimedia/opieplayer/libmad/config.in
+++ b/core/multimedia/opieplayer/libmad/config.in
@@ -1,4 +1,4 @@
config LIBMAD
- boolean "libmad"
+ boolean "libmadplugin"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/libmpeg3/config.in b/core/multimedia/opieplayer/libmpeg3/config.in
index a72865f..b634594 100644
--- a/core/multimedia/opieplayer/libmpeg3/config.in
+++ b/core/multimedia/opieplayer/libmpeg3/config.in
@@ -1,4 +1,4 @@
config LIBMPEG3
- boolean "libmpeg3"
+ boolean "libmpeg3plugin"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/modplug/config.in b/core/multimedia/opieplayer/modplug/config.in
index 67fbe8c..769db1b 100644
--- a/core/multimedia/opieplayer/modplug/config.in
+++ b/core/multimedia/opieplayer/modplug/config.in
@@ -1,4 +1,4 @@
config MODPLUG
- boolean "modplug"
+ boolean "modplugin"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/wavplugin/config.in b/core/multimedia/opieplayer/wavplugin/config.in
index c5201c7..6e4c4b3 100644
--- a/core/multimedia/opieplayer/wavplugin/config.in
+++ b/core/multimedia/opieplayer/wavplugin/config.in
@@ -1,4 +1,4 @@
config WAVPLUGIN
boolean "wavplugin"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/opie-login/config.in b/core/opie-login/config.in
index fe5cc7e..ba428ba 100644
--- a/core/opie-login/config.in
+++ b/core/opie-login/config.in
@@ -1,4 +1,4 @@
config OPIE-LOGIN
- boolean "opie-login"
+ boolean "Opie-login (Initial Login app, ala xdm/kdm/gdm)"
default "y"
depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE