menu cleanup; patch by Steven Scholz

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5503 33e552b5-05e3-0310-8538-816dae2090ed

14 files changed, 8 insertions, 49 deletions

diff --git a/rules/libnet.in b/rules/libnet.in
index f71ee5e2b..4baa3fb28 100644
--- a/rules/libnet.in
+++ b/rules/libnet.in
@@ -1,9 +1,6 @@
-menu    "libnet              "
-
 config LIBNET
 	bool
 	prompt "libnet"
 	help
 	  FIXME: This item needs to be documented
 
-endmenu
diff --git a/rules/libpcap.in b/rules/libpcap.in
index 78bd43dbe..064306110 100644
--- a/rules/libpcap.in
+++ b/rules/libpcap.in
@@ -1,9 +1,6 @@
-menu    "libpcap             "
-
 config LIBPCAP
 	bool
 	prompt "libpcap"
 	help
 	  FIXME: This item needs to be documented
 
-endmenu
diff --git a/rules/mii-diag.in b/rules/mii-diag.in
index 9e320f484..2774bff17 100644
--- a/rules/mii-diag.in
+++ b/rules/mii-diag.in
@@ -1,5 +1,3 @@
-menu    "mii-diag            "
-
 config MII_DIAG
 	bool
 	prompt "mii-diag"
@@ -8,4 +6,4 @@ config MII_DIAG
 	  the transceiver management registers for network 
 	  interfaces,  and  configures  driver  operational
 	  parameters.
-endmenu
+
diff --git a/rules/netcat.in b/rules/netcat.in
index 25b47f283..275c9034d 100644
--- a/rules/netcat.in
+++ b/rules/netcat.in
@@ -1,8 +1,6 @@
-menu    "netcat              "
-
-config NETCAT
+menuconfig NETCAT
 	bool
-	prompt "GNU netcat"
+	prompt "netcat              "
 	help
 	  This is the GNU Flavour of the "netcat" utility. 
 	  
@@ -50,4 +48,3 @@ config  NETCAT_OLD_TELNET
 	help
 	  Disabled by default - if unsure, say NO
 
-endmenu
diff --git a/rules/netkit-ftp.in b/rules/netkit-ftp.in
index a7139ff49..21d3bdc3a 100644
--- a/rules/netkit-ftp.in
+++ b/rules/netkit-ftp.in
@@ -1,12 +1,9 @@
-menu "netkit-ftp          "
-
 config NETKIT_FTP
 	bool
-	prompt "Install the NetKit FTP client"
+	prompt "NetKit FTP client"
 	help 
 	  This is the ftp client from netkit 
 	  See http://freshmeat.net/projects/netkit/ for details.
 
 	  License: BSD License (original)
 
-endmenu
diff --git a/rules/ntpclient.in b/rules/ntpclient.in
index 27ce33394..854da1133 100644
--- a/rules/ntpclient.in
+++ b/rules/ntpclient.in
@@ -1,5 +1,3 @@
-menu	"ntpclient           "
-
 config NTPCLIENT
 	bool
 	depends on BROKEN
@@ -24,4 +22,3 @@ config NTPCLIENT
 comment "ntpclient is broken, please send a patch"
 	depends on !BROKEN
 
-endmenu
diff --git a/rules/ppp.in b/rules/ppp.in
index 776239b14..9794a8a06 100644
--- a/rules/ppp.in
+++ b/rules/ppp.in
@@ -1,8 +1,6 @@
-menu	"ppp                 "
-
-config PPP
+menuconfig PPP
 	bool
-	prompt "ppp"
+	prompt "ppp                 "
 	help
 	  FIXME: This item needs to be documented
 
@@ -41,4 +39,3 @@ config PPP_MULTILINK
 	help
 	  FIXME: This item needs to be documented
 
-endmenu
diff --git a/rules/rsync.in b/rules/rsync.in
index 1656b1837..46f0e5755 100644
--- a/rules/rsync.in
+++ b/rules/rsync.in
@@ -1,5 +1,3 @@
-menu	"rsync               "
-
 config RSYNC   
 	bool
 	prompt "rsync"
@@ -9,4 +7,3 @@ config RSYNC
 	  rsync remote-update protocol to greatly speed up file 
 	  transfers when the destination file is being updated.
 
-endmenu
diff --git a/rules/shorewall.in b/rules/shorewall.in
index 353a50ab4..4b681a56f 100644
--- a/rules/shorewall.in
+++ b/rules/shorewall.in
@@ -1,5 +1,3 @@
-menu 	"shorewall firewall  "
-
 config SHOREWALL
 	bool
 	prompt "shorewall firewall scripts"
@@ -21,4 +19,3 @@ config SHOREWALL
 	  * Support for IPSEC, GRE and IPIP Tunnels.
 	  * Limited support for Traffic Control/Shaping
 
-endmenu
diff --git a/rules/tcpwrapper.in b/rules/tcpwrapper.in
index feb6bd0f1..00d97779b 100644
--- a/rules/tcpwrapper.in
+++ b/rules/tcpwrapper.in
@@ -1,8 +1,6 @@
-menu	"tcpwrapper          "
-
-config	TCPWRAPPER
+menuconfig	TCPWRAPPER
 	bool
-	prompt "tcpwrapper"
+	prompt "tcpwrapper          "
 	help
 	  FIXME: This item needs to be documented
 
@@ -13,4 +11,3 @@ config	TCPWRAPPER_INSTALL_TCPD
 	help
 	  FIXME: This item needs to be documented
 
-endmenu
diff --git a/rules/troll-ftpd.in b/rules/troll-ftpd.in
index 2e4a07004..6b5ec5b18 100644
--- a/rules/troll-ftpd.in
+++ b/rules/troll-ftpd.in
@@ -1,5 +1,3 @@
-menu	"Troll FTPD          "
-
 config TROLL_FTPD
 	bool
 	prompt "troll-ftpd"
@@ -14,4 +12,3 @@ config TROLL_FTPD
 comment "trollftpd is broken, please send a patch"
 	depends on !BROKEN
 
-endmenu
diff --git a/rules/utelnetd.in b/rules/utelnetd.in
index 844a7952e..c4b325956 100644
--- a/rules/utelnetd.in
+++ b/rules/utelnetd.in
@@ -1,9 +1,6 @@
-menu	"utelnetd            "
-
 config UTELNETD
 	bool
 	prompt "utelnetd"
 	help
 	  FIXME: This item needs to be documented
 
-endmenu
diff --git a/rules/wget.in b/rules/wget.in
index 6e9409e51..90c87b483 100644
--- a/rules/wget.in
+++ b/rules/wget.in
@@ -1,5 +1,3 @@
-menu    "wget                "
-
 config WGET
 	bool
 	prompt "wget"
@@ -32,4 +30,3 @@ config WGET
  	
 	  http://www.gnu.org/software/wget/
 
-endmenu
diff --git a/rules/zebra.in b/rules/zebra.in
index 9ff718839..f4980c42b 100644
--- a/rules/zebra.in
+++ b/rules/zebra.in
@@ -1,5 +1,3 @@
-menu    "GNU Zebra           "
-
 config ZEBRA
 	bool
 	prompt "GNU Zebra"
@@ -21,4 +19,3 @@ config ZEBRA
 comment "zebra is broken, please send a patch"
 	depends on !BROKEN
 
-endmenu