simplified networksettings2 config.in files: NSMAIN was not necessary, and forced to have two 'config NAME' in the same config.in (the first level one), hence breaking generated deps. Now everything simply depend on (and appears in menuconfig when we select) NS2CORE

13 files changed, 29 insertions, 33 deletions

diff --git a/noncore/settings/networksettings2/bluetooth/config.in b/noncore/settings/networksettings2/bluetooth/config.in
index b1a5a58..6968ac8 100644
--- a/noncore/settings/networksettings2/bluetooth/config.in
+++ b/noncore/settings/networksettings2/bluetooth/config.in
@@ -1,4 +1,4 @@
   config NS2BT
     boolean "opie-networksettings2plugin-bluetooth (set up BLUETOOTH)"
-    default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/cable/config.in b/noncore/settings/networksettings2/cable/config.in
index 9007f14..cc94050 100644
--- a/noncore/settings/networksettings2/cable/config.in
+++ b/noncore/settings/networksettings2/cable/config.in
@@ -1,4 +1,4 @@
   config NS2CABLE
     boolean "opie-networksettings2plugin-cable (set up Cable)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/config.in b/noncore/settings/networksettings2/config.in
index ac38c2f..d0e5a32 100644
--- a/noncore/settings/networksettings2/config.in
+++ b/noncore/settings/networksettings2/config.in
@@ -1,15 +1,10 @@
   source noncore/settings/networksettings2/networksettings2/config.in
 
 config NS2
   boolean
-  default "y" if NS2MAIN
-  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN
-
-config NS2CORE
-  boolean
-  default "y" if NS2
-  depends ( LIBQPE || LIBQPE-X11 ) && NS2
+  default "y"
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
 
   source noncore/settings/networksettings2/profile/config.in
   source noncore/settings/networksettings2/network/config.in
   source noncore/settings/networksettings2/lancard/config.in
diff --git a/noncore/settings/networksettings2/irda/config.in b/noncore/settings/networksettings2/irda/config.in
index 0da9a25..3c9a112 100644
--- a/noncore/settings/networksettings2/irda/config.in
+++ b/noncore/settings/networksettings2/irda/config.in
@@ -1,4 +1,4 @@
   config NS2IRDA
     boolean "opie-networksettings2plugin-irda (set up IRDA)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/lancard/config.in b/noncore/settings/networksettings2/lancard/config.in
index c694908..8b7fd7d 100644
--- a/noncore/settings/networksettings2/lancard/config.in
+++ b/noncore/settings/networksettings2/lancard/config.in
@@ -1,4 +1,4 @@
   config NS2LANCARD
     boolean "opie-networksettings2plugin-lancard (regular wired lan card)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/modem/config.in b/noncore/settings/networksettings2/modem/config.in
index a354da0..bd0c4e0 100644
--- a/noncore/settings/networksettings2/modem/config.in
+++ b/noncore/settings/networksettings2/modem/config.in
@@ -1,4 +1,4 @@
   config NS2MODEM
     boolean "opie-networksettings2plugin-modem (set up DIALUP)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/network/config.in b/noncore/settings/networksettings2/network/config.in
index 725b7f0..418551d 100644
--- a/noncore/settings/networksettings2/network/config.in
+++ b/noncore/settings/networksettings2/network/config.in
@@ -1,4 +1,4 @@
   config NS2NETWORK
     boolean "opie-networksettings2plugin-ipsetup (set up TCP/IP)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/networksettings2/config.in b/noncore/settings/networksettings2/networksettings2/config.in
index 2b51ecb..b384e18 100644
--- a/noncore/settings/networksettings2/networksettings2/config.in
+++ b/noncore/settings/networksettings2/networksettings2/config.in
@@ -1,4 +1,5 @@
-  config NS2MAIN
-    boolean "opie-networksettings2 (TCP/IP network settings)"
-    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
+config NS2CORE
+  boolean "opie-networksettings2 (TCP/IP network settings)"
+  default "y"
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
+
diff --git a/noncore/settings/networksettings2/ppp/config.in b/noncore/settings/networksettings2/ppp/config.in
index c722a10..301d82f 100644
--- a/noncore/settings/networksettings2/ppp/config.in
+++ b/noncore/settings/networksettings2/ppp/config.in
@@ -1,4 +1,4 @@
   config NS2PPP
     boolean "opie-networksettings2plugin-ppp (set up PPP)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/profile/config.in b/noncore/settings/networksettings2/profile/config.in
index f99ef99..a0d737a 100644
--- a/noncore/settings/networksettings2/profile/config.in
+++ b/noncore/settings/networksettings2/profile/config.in
@@ -1,4 +1,4 @@
   config NS2PROFILE
     boolean "opie-networksettings2plugin-profiles (User profiles)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/usb/config.in b/noncore/settings/networksettings2/usb/config.in
index d0c6cba..631b248 100644
--- a/noncore/settings/networksettings2/usb/config.in
+++ b/noncore/settings/networksettings2/usb/config.in
@@ -1,4 +1,4 @@
   config NS2USB
     boolean "opie-networksettings2plugin-usb (set up USB)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/vpn/config.in b/noncore/settings/networksettings2/vpn/config.in
index 0d2cb3a..704ec35 100644
--- a/noncore/settings/networksettings2/vpn/config.in
+++ b/noncore/settings/networksettings2/vpn/config.in
@@ -1,4 +1,4 @@
   config NS2VPN
     boolean "opie-networksettings2plugin-vpn (set up VPN)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE
diff --git a/noncore/settings/networksettings2/wlan/config.in b/noncore/settings/networksettings2/wlan/config.in
index 13ef9da..8811f3a 100644
--- a/noncore/settings/networksettings2/wlan/config.in
+++ b/noncore/settings/networksettings2/wlan/config.in
@@ -1,4 +1,4 @@
   config NS2WLAN
     boolean "opie-networksettings2plugin-wlan (set up Wireless LAN)"
-    default "n" if NS2MAIN
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
+    default "n" if NS2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE