Rework things a bit to build the server, client, etc

3 files changed, 113 insertions, 57 deletions

diff --git a/package/dhcp_relay/Config.in b/package/dhcp_relay/Config.in
index 4d9b6d463..4d19710a8 100644
--- a/package/dhcp_relay/Config.in
+++ b/package/dhcp_relay/Config.in
@@ -1,7 +1,31 @@
-config BR2_PACKAGE_DHCP_RELAY
-	bool "dhcp_relay"
+config BR2_PACKAGE_ISC_DHCP
+	bool "DHCP support"
 	default n
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
 
 	  http://www.isc.org/products/DHCP
+
+config BR2_PACKAGE_DHCP_SERVER
+	bool "dhcp server"
+	depends BR2_PACKAGE_ISC_DHCP
+	default n
+	help
+	  DHCP server from the ISC DHCP distribution.
+
+
+config BR2_PACKAGE_DHCP_RELAY
+	bool "dhcp relay"
+	depends BR2_PACKAGE_ISC_DHCP
+	default n
+	help
+	  DHCP relay agent from the ISC DHCP distribution.
+
+
+config BR2_PACKAGE_DHCP_CLIENT
+	bool "dhcp client"
+	depends BR2_PACKAGE_ISC_DHCP
+	default n
+	help
+	  DHCP client from the ISC DHCP distribution.
+
diff --git a/package/dhcp_relay/dhcp.mk b/package/dhcp_relay/dhcp.mk
new file mode 100644
index 000000000..c99241313
--- /dev/null
+++ b/package/dhcp_relay/dhcp.mk
@@ -0,0 +1,87 @@
+#############################################################
+#
+# dhcp
+#
+#############################################################
+DHCP:=dhcp-3.0.1.tar.gz
+DHCP_SITE:=ftp://ftp.isc.org/isc/dhcp
+DHCP_CAT:=zcat
+DHCP_DIR:=$(BUILD_DIR)/dhcp-3.0.1
+DHCP_RELAY_BINARY:=work.linux-2.2/relay/dhcrelay
+DHCP_SERVER_TARGET_BINARY:=usr/sbin/dhcpd
+DHCP_RELAY_TARGET_BINARY:=usr/sbin/dhcrelay
+DHCP_CLIENT_TARGET_BINARY:=usr/sbin/dhclient
+BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
+	-D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\"' \
+	VARDB=/var/lib/dhcp
+
+$(DL_DIR)/$(DHCP):
+	 $(WGET) -P $(DL_DIR) $(DHCP_SITE)/$(DHCP)
+
+dhcp-source: $(DL_DIR)/$(DHCP)
+
+$(DHCP_DIR)/.unpacked: $(DL_DIR)/$(DHCP)
+	$(DHCP_CAT) $(DL_DIR)/$(DHCP) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(DHCP_DIR)/.unpacked
+
+$(DHCP_DIR)/.configured: $(DHCP_DIR)/.unpacked
+	(cd $(DHCP_DIR); $(TARGET_CONFIGURE_OPTS) ./configure );
+	touch  $(DHCP_DIR)/.configured
+
+$(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) $(BVARS) -C $(DHCP_DIR)
+	$(STRIP) $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
+
+$(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
+	(cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp)
+	install -m 0755 $(DHCP_DIR)/dhcpd $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY)
+	install -m 0755 $(DHCP_DIR)/dhcp-server $(TARGET_DIR)/etc/init.d/dhcp-server
+	install -m 0644 $(DHCP_DIR)/dhcpd.conf $(TARGET_DIR)/etc/dhcp/dhcpd.conf
+	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+$(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
+	(cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp)
+	install -m 0755 $(DHCP_DIR)/work.linux-2.2/relay/dhcrelay $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY)
+	install -m 0755 $(DHCP_DIR)/work.linux-2.2/relay/dhcp-relay $(TARGET_DIR)/etc/init.d/dhcp-relay
+	install -m 0644 $(DHCP_DIR)/dhclient.conf $(TARGET_DIR)/etc/default/dhcp-relay
+	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+$(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
+	(cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp)
+	install -m 0755 $(DHCP_DIR)/dhclient $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY)
+	install -m 0644 $(DHCP_DIR)/dhclient.conf $(TARGET_DIR)/etc/dhcp/dhclient.conf
+	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+dhcp_server: uclibc $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY)
+
+dhcp_relay: uclibc $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY)
+
+dhcp_client: uclibc $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY)
+
+dhcp-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DHCP_DIR) uninstall
+	-$(MAKE) -C $(DHCP_DIR) clean
+
+dhcp-dirclean:
+	rm -rf $(DHCP_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ISC_DHCP)),y)
+TARGETS+=dhcp
+endif
+ifeq ($(strip $(BR2_PACKAGE_DHCP_SERVER)),y)
+TARGETS+=dhcp_relay
+endif
+ifeq ($(strip $(BR2_PACKAGE_DHCP_RELAY)),y)
+TARGETS+=dhcp_relay
+endif
+ifeq ($(strip $(BR2_PACKAGE_DHCP_CLIENT)),y)
+TARGETS+=dhcp_relay
+endif
diff --git a/package/dhcp_relay/dhcp_relay.mk b/package/dhcp_relay/dhcp_relay.mk
deleted file mode 100644
index 78ba42b1d..000000000
--- a/package/dhcp_relay/dhcp_relay.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#############################################################
-#
-# dhcp_relay
-#
-#############################################################
-DHCP_RELAY_SOURCE:=dhcp-3.0.1.tar.gz
-DHCP_RELAY_SITE:=ftp://ftp.isc.org/isc/dhcp
-DHCP_RELAY_CAT:=zcat
-DHCP_RELAY_DIR:=$(BUILD_DIR)/dhcp-3.0.1
-DHCP_RELAY_BINARY:=work.linux-2.2/relay/dhcrelay
-DHCP_RELAY_TARGET_BINARY:=usr/sbin/dhcrelay
-BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
-	-D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\"' \
-	VARDB=/var/lib/dhcp
-
-$(DL_DIR)/$(DHCP_RELAY_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(DHCP_RELAY_SITE)/$(DHCP_RELAY_SOURCE)
-
-dhcp_relay-source: $(DL_DIR)/$(DHCP_RELAY_SOURCE)
-
-$(DHCP_RELAY_DIR)/.unpacked: $(DL_DIR)/$(DHCP_RELAY_SOURCE)
-	$(DHCP_RELAY_CAT) $(DL_DIR)/$(DHCP_RELAY_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(DHCP_RELAY_DIR)/.unpacked
-
-$(DHCP_RELAY_DIR)/.configured: $(DHCP_RELAY_DIR)/.unpacked
-	(cd $(DHCP_RELAY_DIR); $(TARGET_CONFIGURE_OPTS) ./configure );
-	touch  $(DHCP_RELAY_DIR)/.configured
-
-$(DHCP_RELAY_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_RELAY_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) $(BVARS) -C $(DHCP_RELAY_DIR)
-	$(STRIP) $(DHCP_RELAY_DIR)/$(DHCP_RELAY_BINARY)
-
-$(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_RELAY_DIR)/$(DHCP_RELAY_BINARY)
-	(cd $(TARGET_DIR)/var/lib; ln -sf /tmp dhcp)
-	cp -a $(DHCP_RELAY_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY)
-	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-
-dhcp_relay: uclibc $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY)
-
-dhcp_relay-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DHCP_RELAY_DIR) uninstall
-	-$(MAKE) -C $(DHCP_RELAY_DIR) clean
-
-dhcp_relay-dirclean:
-	rm -rf $(DHCP_RELAY_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_DHCP_RELAY)),y)
-TARGETS+=dhcp_relay
-endif