author | clem <clem> | 2004-10-15 21:30:28 (UTC) |
---|---|---|
committer | clem <clem> | 2004-10-15 21:30:28 (UTC) |
commit | db5e39dbf2e81b3e4e2a7e13fa1a51c34a86e319 (patch) (unidiff) | |
tree | b7734c1789e0dc447afa0e6c828062da254cd489 /noncore | |
parent | 2f21eb064d11b6ef8edf2db77d3a8a6ce4266a0b (diff) | |
download | opie-db5e39dbf2e81b3e4e2a7e13fa1a51c34a86e319.zip opie-db5e39dbf2e81b3e4e2a7e13fa1a51c34a86e319.tar.gz opie-db5e39dbf2e81b3e4e2a7e13fa1a51c34a86e319.tar.bz2 |
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 @@ | |||
1 | config NS2BT | 1 | config NS2BT |
2 | boolean "opie-networksettings2plugin-bluetooth (set up BLUETOOTH)" | 2 | boolean "opie-networksettings2plugin-bluetooth (set up BLUETOOTH)" |
3 | default "n" | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2CABLE | 1 | config NS2CABLE |
2 | boolean "opie-networksettings2plugin-cable (set up Cable)" | 2 | boolean "opie-networksettings2plugin-cable (set up Cable)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 | |||
@@ -3,11 +3,6 @@ | |||
3 | config NS2 | 3 | config NS2 |
4 | boolean | 4 | boolean |
5 | default "y" if NS2MAIN | 5 | default "y" |
6 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN | 6 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE |
7 | |||
8 | config NS2CORE | ||
9 | boolean | ||
10 | default "y" if NS2 | ||
11 | depends ( LIBQPE || LIBQPE-X11 ) && NS2 | ||
12 | 7 | ||
13 | source noncore/settings/networksettings2/profile/config.in | 8 | source noncore/settings/networksettings2/profile/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 @@ | |||
1 | config NS2IRDA | 1 | config NS2IRDA |
2 | boolean "opie-networksettings2plugin-irda (set up IRDA)" | 2 | boolean "opie-networksettings2plugin-irda (set up IRDA)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2LANCARD | 1 | config NS2LANCARD |
2 | boolean "opie-networksettings2plugin-lancard (regular wired lan card)" | 2 | boolean "opie-networksettings2plugin-lancard (regular wired lan card)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2MODEM | 1 | config NS2MODEM |
2 | boolean "opie-networksettings2plugin-modem (set up DIALUP)" | 2 | boolean "opie-networksettings2plugin-modem (set up DIALUP)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2NETWORK | 1 | config NS2NETWORK |
2 | boolean "opie-networksettings2plugin-ipsetup (set up TCP/IP)" | 2 | boolean "opie-networksettings2plugin-ipsetup (set up TCP/IP)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2MAIN | 1 | config NS2CORE |
2 | boolean "opie-networksettings2 (TCP/IP network settings)" | 2 | boolean "opie-networksettings2 (TCP/IP network settings)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
5 | |||
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 @@ | |||
1 | config NS2PPP | 1 | config NS2PPP |
2 | boolean "opie-networksettings2plugin-ppp (set up PPP)" | 2 | boolean "opie-networksettings2plugin-ppp (set up PPP)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2PROFILE | 1 | config NS2PROFILE |
2 | boolean "opie-networksettings2plugin-profiles (User profiles)" | 2 | boolean "opie-networksettings2plugin-profiles (User profiles)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2USB | 1 | config NS2USB |
2 | boolean "opie-networksettings2plugin-usb (set up USB)" | 2 | boolean "opie-networksettings2plugin-usb (set up USB)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2VPN | 1 | config NS2VPN |
2 | boolean "opie-networksettings2plugin-vpn (set up VPN)" | 2 | boolean "opie-networksettings2plugin-vpn (set up VPN)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | 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 @@ | |||
1 | config NS2WLAN | 1 | config NS2WLAN |
2 | boolean "opie-networksettings2plugin-wlan (set up Wireless LAN)" | 2 | boolean "opie-networksettings2plugin-wlan (set up Wireless LAN)" |
3 | default "n" if NS2MAIN | 3 | default "n" if NS2 |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2CORE |