Yet another major rework of the BusyBox config system, using the considerably

modified Kbuild system I put into uClibc.  With this, there should be no more
need to modify Rules.mak since I've moved all the interesting options into the
config system.  I think I've got everything updated, but you never know, I may
have made some mistakes, so watch closely.
 -Erik

5 files changed, 380 insertions, 110 deletions

diff --git a/networking/Config.in b/networking/Config.in
new file mode 100644
index 000000000..0ff3f52bc
--- /dev/null
+++ b/networking/Config.in
@@ -0,0 +1,332 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Networking Utilities"
+
+config CONFIG_FEATURE_IPV6
+	bool "Enable IPv6 support"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_HOSTNAME
+	bool "hostname"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_IFCONFIG
+	bool "ifconfig"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IFCONFIG_STATUS
+	bool "  Enable status reporting output (+7k)"
+	default y
+	depends on CONFIG_IFCONFIG
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IFCONFIG_SLIP
+	bool "  Enable slip-specific options \"keepalive\" and \"outfill\""
+	default n
+	depends on CONFIG_IFCONFIG
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
+	bool "  Enable options \"mem_start\", \"io_addr\", and \"irq\""
+	default n
+	depends on CONFIG_IFCONFIG
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IFCONFIG_HW
+	bool "  Enable option \"hw\" (ether only)"
+	default y
+	depends on CONFIG_IFCONFIG
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
+	bool "  Set the broadcast automatically"
+	default n
+	depends on CONFIG_IFCONFIG
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_IFUPDOWN
+	bool "ifupdown"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IFUPDOWN_IPV4
+	bool "  Enable support for IPv4"
+	default y
+	depends on CONFIG_IFUPDOWN
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IFUPDOWN_IPV6
+	bool "  Enable support for IPv6 (requires ip command)"
+	default n
+	depends on CONFIG_IFUPDOWN
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IFUPDOWN_IPX
+	bool "  Enable support for IPX (requires ipx_interface command)"
+	default n
+	depends on CONFIG_IFUPDOWN
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_IP
+	bool "ip"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+if CONFIG_IP && CONFIG_IPADDR
+	config CONFIG_FEATURE_IP_ADDRESS
+		default y
+	comment "  address (forced enabled for ipaddr)"
+endif
+if ! (CONFIG_IP && CONFIG_IPADDR)
+	config CONFIG_FEATURE_IP_ADDRESS
+		bool "  address"
+		default n
+		depends on CONFIG_IP
+		help
+		  Please submit a patch to add help text for this item.
+endif
+
+if CONFIG_IP && CONFIG_IPLINK
+	config CONFIG_FEATURE_IP_LINK
+		default y
+	comment "  link (forced enabled for iplink)"
+endif
+if !(CONFIG_IP && CONFIG_IPLINK)
+	config CONFIG_FEATURE_IP_LINK
+		bool "  link"
+		default y
+		depends on CONFIG_IP
+		help
+		  Please submit a patch to add help text for this item.
+endif
+
+if CONFIG_IP && CONFIG_IPROUTE
+	config CONFIG_FEATURE_IP_ROUTE
+		default y
+	comment "  route (forced enabled for iproute)"
+endif
+if !(CONFIG_IP && CONFIG_IPROUTE)
+	config CONFIG_FEATURE_IP_ROUTE
+		bool "  route"
+		default y
+		depends on CONFIG_IP
+		help
+		  Please submit a patch to add help text for this item.
+endif
+
+if CONFIG_IP && CONFIG_IPTUNNEL
+	config CONFIG_FEATURE_IP_TUNNEL
+		default y
+	comment "  tunnel (forced enabled for iptunnel)"
+endif
+if !(CONFIG_IP && CONFIG_IPTUNNEL)
+	config CONFIG_FEATURE_IP_TUNNEL
+		bool "  tunnel"
+		default y
+		depends on CONFIG_IP
+		help
+		  Please submit a patch to add help text for this item.
+endif
+
+config CONFIG_IPCALC
+	bool "ipcalc"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_IPCALC_FANCY
+	bool "  Fancy IPCALC, more options, adds 300 bytes"
+	default y
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_IPADDR
+	bool "ipaddr"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_IPLINK
+	bool "iplink"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_IPROUTE
+	bool "iproute"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_IPTUNNEL
+	bool "iptunnel"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_NC
+	bool "nc"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_NETSTAT
+	bool "netstat"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_NSLOOKUP
+	bool "nslookup"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_PING
+	bool "ping"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_FANCY_PING
+	bool "  Enable fancy ping output"
+	default y
+	depends on CONFIG_PING
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_PING6
+	bool "ping6"
+	default n
+	depends on CONFIG_FEATURE_IPV6
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_FANCY_PING6
+	bool "  Enable fancy ping6 output"
+	default y
+	depends on CONFIG_PING6
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ROUTE
+	bool "route"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_TELNET
+	bool "telnet"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TELNET_TTYPE
+	bool "  Pass TERM type to remote host"
+	default y
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_TELNETD
+	bool "telnetd"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_TFTP
+	bool "tftp"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TFTP_GET
+	bool "  Enable \"get\" command"
+	default y
+	depends on CONFIG_TFTP
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TFTP_PUT
+	bool "  Enable \"put\" command"
+	default y
+	depends on CONFIG_TFTP
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TFTP_BLOCKSIZE
+	bool "  Enable \"blocksize\" command"
+	default n
+	depends on CONFIG_TFTP
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TFTP_DEBUG
+	bool "  Enable debug"
+	default y
+	depends on CONFIG_TFTP
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_TRACEROUTE
+	bool "traceroute"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TRACEROUTE_VERBOSE
+	bool "  Enable verbose output"
+	default y
+	depends on CONFIG_TRACEROUTE
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TRACEROUTE_SO_DEBUG
+	bool "  Enable SO_DEBUG option"
+	default y
+	depends on CONFIG_TRACEROUTE
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_WGET
+	bool "wget"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_WGET_STATUSBAR
+	bool "  Enable a nifty process meter (+2k)"
+	default y
+	depends on CONFIG_WGET
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_WGET_AUTHENTICATION
+	bool "  Enable HTTP authentication"
+	default y
+	depends on CONFIG_WGET
+	help
+	  Please submit a patch to add help text for this item.
+
+source networking/udhcp/Config.in
+
+endmenu
+
diff --git a/networking/config.in b/networking/config.in
deleted file mode 100644
index de5b92064..000000000
--- a/networking/config.in
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-mainmenu_option next_comment
-comment 'Networking Utilities'
-
-bool 'Enable IPv6 support'						CONFIG_FEATURE_IPV6
-bool 'hostname'	    CONFIG_HOSTNAME
-bool 'ifconfig'	    CONFIG_IFCONFIG
-if [ "$CONFIG_IFCONFIG" = "y" ]; then
-    bool '  Enable status reporting output (+7k)'					CONFIG_FEATURE_IFCONFIG_STATUS  
-    bool '  Enable slip-specific options "keepalive" and "outfill"'	CONFIG_FEATURE_IFCONFIG_SLIP
-    bool '  Enable options "mem_start", "io_addr", and "irq"'		CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-    bool '  Enable option "hw" (ether only)'						CONFIG_FEATURE_IFCONFIG_HW 
-    bool '  Set the broadcast automatically'					CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
-fi
-bool 'ifupdown'	    CONFIG_IFUPDOWN
-if [ "$CONFIG_IFUPDOWN" = "y" ]; then
-    bool '  Enable support for IPv4'	CONFIG_FEATURE_IFUPDOWN_IPV4
-    bool '  Enable support for IPv6 (requires ip command)' CONFIG_FEATURE_IFUPDOWN_IPV6
-    bool '  Enable support for IPX (requires ipx_interface command)' CONFIG_FEATURE_IFUPDOWN_IPX
-fi
-bool 'ip'	    CONFIG_IP
-if [ "$CONFIG_IP" = "y" ]; then
-    bool '  address'		CONFIG_FEATURE_IP_ADDRESS
-    bool '  link'		CONFIG_FEATURE_IP_LINK
-    bool '  route'		CONFIG_FEATURE_IP_ROUTE
-    bool '  tunnel'		CONFIG_FEATURE_IP_TUNNEL
-fi
-bool 'ipcalc'	    CONFIG_IPCALC
-if [ "$CONFIG_IPCALC" = "y" ]; then
-    bool '  Fancy IPCALC, more options, adds 300 bytes'	CONFIG_FEATURE_IPCALC_FANCY
-fi
-bool 'ipaddr'		CONFIG_IPADDR
-if [ "$CONFIG_IP" = "y" ] && [ "$CONFIG_IPADDR" = "y" ]; then
-	define_bool	CONFIG_FEATURE_IP_ADDRESS	y
-fi
-bool 'iplink'		CONFIG_IPLINK
-if [ "$CONFIG_IP" = "y" ] && [ "$CONFIG_IPLINK" = "y" ]; then
-	define_bool	CONFIG_FEATURE_IP_LINK	y
-fi
-bool 'iproute'		CONFIG_IPROUTE
-if [ "$CONFIG_IP" = "y" ] && [ "$CONFIG_IPROUTE" = "y" ]; then
-	define_bool	CONFIG_FEATURE_IP_ROUTE	y
-fi
-bool 'iptunnel'		CONFIG_IPTUNNEL
-if [ "$CONFIG_IP" = "y" ] && [ "$CONFIG_IPTUNNEL" = "y" ]; then
-	define_bool	CONFIG_FEATURE_IP_TUNNEL	y
-fi
-bool 'nc'			CONFIG_NC
-bool 'netstat'	    CONFIG_NETSTAT
-bool 'nslookup'	    CONFIG_NSLOOKUP
-bool 'ping'			CONFIG_PING
-if [ "$CONFIG_PING" = "y" ]; then
-    bool '  Enable fancy ping output'		CONFIG_FEATURE_FANCY_PING
-fi
-if [ "$CONFIG_FEATURE_IPV6" = "y" ]; then
-    bool 'ping6'	    CONFIG_PING6
-    if [ "$CONFIG_PING6" = "y" ]; then
-        bool '  Enable fancy ping6 output'		CONFIG_FEATURE_FANCY_PING6
-    fi
-fi
-bool 'route'	    CONFIG_ROUTE
-bool 'telnet'	    CONFIG_TELNET
-if [ "$CONFIG_TELNET" = "y" ]; then
-    bool '  Pass TERM type to remote host'		CONFIG_FEATURE_TELNET_TTYPE
-fi
-bool 'telnetd'      CONFIG_TELNETD
-bool 'tftp'	    CONFIG_TFTP
-if [ "$CONFIG_TFTP" = "y" ]; then
-    bool '  Enable "get" command'			CONFIG_FEATURE_TFTP_GET
-    bool '  Enable "put" command'			CONFIG_FEATURE_TFTP_PUT
-    bool '  Enable "blocksize" option'		CONFIG_FEATURE_TFTP_BLOCKSIZE
-    bool '  Enable debug'					CONFIG_FEATURE_TFTP_DEBUG
-fi
-bool 'traceroute'   CONFIG_TRACEROUTE
-if [ "$CONFIG_TRACEROUTE" = "y" ]; then
-    bool '  Enable verbose output'			CONFIG_FEATURE_TRACEROUTE_VERBOSE
-    bool '  Enable SO_DEBUG option'	CONFIG_FEATURE_TRACEROUTE_SO_DEBUG
-fi
-bool 'wget'	    CONFIG_WGET
-if [ "$CONFIG_WGET" = "y" ]; then
-    bool '  Enable a nifty process meter (+2k)'	CONFIG_FEATURE_WGET_STATUSBAR
-	bool '  Enable HTTP authentication'			CONFIG_FEATURE_WGET_AUTHENTICATION
-fi
-
-source networking/udhcp/config.in
-
-endmenu
-
diff --git a/networking/udhcp/Config.in b/networking/udhcp/Config.in
new file mode 100644
index 000000000..5baaa6a49
--- /dev/null
+++ b/networking/udhcp/Config.in
@@ -0,0 +1,42 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "udhcp Server/Client"
+
+config CONFIG_UDHCPD
+	bool "udhcp Server (udhcpd)"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_UDHCPC
+	bool "udhcp Client (udhcpc)"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_DUMPLEASES
+	bool "Lease display utility (dumpleases)"
+	default n
+	depends on CONFIG_UDHCPD
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_UDHCP_SYSLOG
+	bool "  Log udhcp messages to syslog (instead of stdout)"
+	default n
+	depends on CONFIG_UDHCPD || CONFIG_UDHCPC
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_UDHCP_DEBUG
+	bool "  Compile udhcp with noisy debugging messages"
+	default n
+	depends on CONFIG_UDHCPD || CONFIG_UDHCPC
+	help
+	  Please submit a patch to add help text for this item.
+
+endmenu
+
diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in
index d76715baa..0b94d9c8f 100644
--- a/networking/udhcp/Makefile.in
+++ b/networking/udhcp/Makefile.in
@@ -44,3 +44,9 @@ libraries-y+=$(UDHCP_DIR)$(UDHCP_AR)
 $(UDHCP_DIR)$(UDHCP_AR): $(patsubst %,$(UDHCP_DIR)%, $(UDHCP-y))
 	$(AR) -ro $@ $(patsubst %,$(UDHCP_DIR)%, $(UDHCP-y))
 
+$(UDHCP_DIR)dhcpc.o: $(UDHCP_DIR)dhcpc.c
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DCOMBINED_BINARY -c $< -o $@
+
+$(UDHCP_DIR)dhcpd.o: $(UDHCP_DIR)dhcpd.c
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DCOMBINED_BINARY -c $< -o $@
+
diff --git a/networking/udhcp/config.in b/networking/udhcp/config.in
deleted file mode 100644
index ede632a8a..000000000
--- a/networking/udhcp/config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-mainmenu_option next_comment
-comment 'udhcp Server/Client'
-
-bool 'udhcp Server (udhcpd)'			CONFIG_UDHCPD
-bool 'udhcp Client (udhcpc)'			CONFIG_UDHCPC
-bool 'Lease display utility (dumpleases)'	CONFIG_DUMPLEASES
-if [ "$CONFIG_UDHCPD" = "y" -o "$CONFIG_UDHCPC" = "y" ]; then
-    bool '  Log udhcp messages to syslog (instead of stdout)' CONFIG_FEATURE_UDHCP_SYSLOG
-    bool '  Compile udhcp with noisy debugging messages' CONFIG_FEATURE_UDHCP_DEBUG  
-fi
-
-endmenu
-