no library

3 files changed, 7 insertions, 21 deletions

diff --git a/usr.sbin/dhcp/Makefile b/usr.sbin/dhcp/Makefile
index 7881c73b478..e3dec3f6bbf 100644
--- a/usr.sbin/dhcp/Makefile
+++ b/usr.sbin/dhcp/Makefile
@@ -30,8 +30,6 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-SUBDIR=	common server client relay
-
-all-server all-client all-relay: all-common
+SUBDIR=	server client relay
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/dhcp/Makefile.inc b/usr.sbin/dhcp/Makefile.inc
index fa8f58505f4..031106d26bd 100644
--- a/usr.sbin/dhcp/Makefile.inc
+++ b/usr.sbin/dhcp/Makefile.inc
@@ -32,14 +32,11 @@
 
 .include <bsd.obj.mk>
 
-WARNS?=	0
-
-COBJDIR!=cd $(.CURDIR)/../common; \
-	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-
+.PATH:	${.CURDIR}/../common
+SRCS+=	raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \
+	packet.c memory.c print.c options.c inet.c convert.c sysconf.c \
+	tree.c tables.c hash.c alloc.c errwarn.c inet_addr.c dns.c resolv.c
 CPPFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../includes
-LDADD=  ${COBJDIR}/libdhcp.a          
-DPADD=  ${COBJDIR}/libdhcp.a          
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/dhcp/common/Makefile b/usr.sbin/dhcp/common/Makefile
index 8d1c99be55d..bfd94f90896 100644
--- a/usr.sbin/dhcp/common/Makefile
+++ b/usr.sbin/dhcp/common/Makefile
@@ -29,16 +29,7 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+NOPROG=
 MAN    = dhcp-options.5
-LIB    = dhcp
-SRCS   = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \
-	 packet.c memory.c print.c options.c inet.c convert.c sysconf.c \
-	 tree.c tables.c hash.c alloc.c errwarn.c inet_addr.c dns.c resolv.c
 
-NOPROFILE=
-NOPIC=
-
-# only needed during build
-libinstall::
-
-.include <bsd.lib.mk>
+.include <bsd.prog.mk>