From 7ff910a94bf3b0ba9a6ef89370513aad6c3be9ee Mon Sep 17 00:00:00 2001
From: "Matthew N. Dodd" <mdodd@FreeBSD.org>
Date: Tue, 25 Mar 2003 03:16:53 +0000
Subject: [PATCH] Hook omshell(1) up to the build.

---
 sbin/dhclient/Makefile         |  5 ++++-
 sbin/dhclient/Makefile.inc     |  6 ++++++
 sbin/dhclient/dhcpctl/Makefile | 15 +++++++++++++++
 sbin/dhclient/omshell/Makefile | 15 +++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 sbin/dhclient/dhcpctl/Makefile
 create mode 100644 sbin/dhclient/omshell/Makefile

diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index d280ef71a8d5..9f2384f6d0f2 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,7 +1,7 @@
 # Makefile for ISC DHCP client.
 # $FreeBSD$
 
-SUBDIR= common dst minires omapip client
+SUBDIR= common dst minires omapip dhcpctl client omshell
 
 
 # Our directory structure confuses crunchgen, so we must explicitly
@@ -43,6 +43,9 @@ OBJS+=	omapip/alloc.o omapip/array.o omapip/auth.o omapip/buffer.o \
 	omapip/mrtrace.o omapip/protocol.o omapip/result.o \
 	omapip/support.o omapip/toisc.o omapip/trace.o
 
+# dhcpctl
+OBJS+=	dhcpctl/dhcpctl.o dhcpctl/callback.o dhcpctl/remote.o
+
 # src/release/Makefile (release.4) tries to invokes this makefile with
 # the target set to the list of all objects defined above.  This
 # top-level Makefile doesn't actually know how to build those objects
diff --git a/sbin/dhclient/Makefile.inc b/sbin/dhclient/Makefile.inc
index c707a8ff38cc..7b2738dbfc8d 100644
--- a/sbin/dhclient/Makefile.inc
+++ b/sbin/dhclient/Makefile.inc
@@ -39,4 +39,10 @@ LIBDST= 	${.OBJDIR}/../dst/libdst.a
 LIBDST=		${.CURDIR}/../dst/libdst.a
 .endif
 
+.if exists(${.OBJDIR}/../dhcpctl)
+LIBDHCPCTL= 	${.OBJDIR}/../dhcpctl/libdhcpctl.a
+.else
+LIBDHCPCTL=	${.CURDIR}/../dhcpctl/libdhcpctl.a
+.endif
+
 .include "../Makefile.inc"
diff --git a/sbin/dhclient/dhcpctl/Makefile b/sbin/dhclient/dhcpctl/Makefile
new file mode 100644
index 000000000000..1f3ecbd07164
--- /dev/null
+++ b/sbin/dhclient/dhcpctl/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+DIST_DIR=	${.CURDIR}/../../../contrib/isc-dhcp
+
+.PATH: ${DIST_DIR}/dhcpctl
+
+LIB=	dhcpctl
+INTERNALLIB=	true
+
+SRCS=	dhcpctl.c callback.c remote.c
+
+MAN=	dhcpctl.3
+NOMAN=	true
+
+.include <bsd.lib.mk>
diff --git a/sbin/dhclient/omshell/Makefile b/sbin/dhclient/omshell/Makefile
new file mode 100644
index 000000000000..4bc5e7065cf5
--- /dev/null
+++ b/sbin/dhclient/omshell/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
+
+.PATH: ${DIST_DIR}/dhcpctl
+
+PROG=	omshell
+SRCS=	omshell.c
+
+DPADD=	${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} ${LIBDHCPCTL}
+LDADD=	${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} ${LIBDHCPCTL}
+
+MAN=	omshell.1
+
+.include <bsd.prog.mk>