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

3 files changed, 48 insertions, 18 deletions

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
-