From 3c442e5104ca1d88825eb05af65874f23a67700f Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 19 Feb 2002 22:23:49 +0000
Subject: [PATCH] Style cleanup.

Approved by:	Murray
---
 sbin/dhclient/Makefile.inc     |  2 ++
 sbin/dhclient/client/Makefile  |  5 ++---
 sbin/dhclient/common/Makefile  | 12 +++++-------
 sbin/dhclient/dst/Makefile     | 12 +++++-------
 sbin/dhclient/minires/Makefile | 15 +++++++--------
 sbin/dhclient/omapip/Makefile  | 13 ++++---------
 6 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/sbin/dhclient/Makefile.inc b/sbin/dhclient/Makefile.inc
index cca723db457a..6295c4bed2e2 100644
--- a/sbin/dhclient/Makefile.inc
+++ b/sbin/dhclient/Makefile.inc
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
 MAINTAINER=     murray
+
 WARNS=		0
+CFLAGS+= -I${DIST_DIR}/includes
 
 CLIENTBINDIR=	/sbin
 RUNDIR=		/var/run
diff --git a/sbin/dhclient/client/Makefile b/sbin/dhclient/client/Makefile
index 37d8b3db71f6..f4a609d5e6a6 100644
--- a/sbin/dhclient/client/Makefile
+++ b/sbin/dhclient/client/Makefile
@@ -8,11 +8,10 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 PROG=	dhclient
 SRCS=	clparse.c dhclient.c
 
-CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
 CFLAGS+= -DCLIENT_PATH='"PATH=/sbin:/bin:/usr/sbin:/usr/bin"' -Dwarn=dhcp_warn
 
-DPADD=  ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST}
-LDADD=  ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} 
+DPADD=	${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST}
+LDADD=	${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} 
 
 SCRIPTS=	scripts/freebsd
 SCRIPTSNAME=	dhclient-script
diff --git a/sbin/dhclient/common/Makefile b/sbin/dhclient/common/Makefile
index c34c8a3f777c..0e859814d763 100644
--- a/sbin/dhclient/common/Makefile
+++ b/sbin/dhclient/common/Makefile
@@ -6,17 +6,15 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 .PATH: ${DIST_DIR}/common
 
 LIB=	dhcp
-NOPROFILE=		true
 INTERNALLIB=		true
-NOPIC=			true
 INTERNALSTATICLIB=	true
 
-SRCS=   raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c	\
-	socket.c lpf.c dlpi.c packet.c tr.c ethernet.c memory.c print.c	\
-	options.c inet.c tree.c tables.c alloc.c fddi.c ctrace.c dns.c	\
-	resolv.c execute.c discover.c comapi.c
+SRCS=	alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c dispatch.c \
+	dlpi.c dns.c ethernet.c execute.c fddi.c icmp.c inet.c lpf.c \
+	memory.c nit.c options.c packet.c parse.c print.c raw.c resolv.c \
+	socket.c tables.c tr.c tree.c upf.c
 
-CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
+CFLAGS+= -I${DIST_DIR}
 
 MAN=	dhcp-eval.5 dhcp-options.5
 
diff --git a/sbin/dhclient/dst/Makefile b/sbin/dhclient/dst/Makefile
index 41dcf6a5e625..e0624797f1df 100644
--- a/sbin/dhclient/dst/Makefile
+++ b/sbin/dhclient/dst/Makefile
@@ -6,15 +6,13 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 .PATH: ${DIST_DIR}/dst
 
 LIB=	 dst
-NOPROFILE=		true
 INTERNALLIB=		true
-NOPIC=			true
 INTERNALSTATICLIB=	true
+
+SRCS=	base64.c dst_api.c dst_support.c hmac_link.c md5_dgst.c prandom.c
+
+CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB
+
 NOMAN=			true
 
-SRCS=	 dst_support.c dst_api.c hmac_link.c md5_dgst.c base64.c prandom.c
-
-#CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) -DHMAC_MD5 -DMINIRES_LIB
-CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR} -DHMAC_MD5 -DMINIRES_LIB
-
 .include <bsd.lib.mk>
diff --git a/sbin/dhclient/minires/Makefile b/sbin/dhclient/minires/Makefile
index 4ee0d03388dc..0b43590b4dec 100644
--- a/sbin/dhclient/minires/Makefile
+++ b/sbin/dhclient/minires/Makefile
@@ -5,17 +5,16 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 
 .PATH: ${DIST_DIR}/minires
 
-LIB= res
-NOPROFILE=		true
+LIB=	res
 INTERNALLIB=		true
-NOPIC=			true
 INTERNALSTATICLIB=	true
-NOMAN=			true
 
-SRCS= 	res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c	     \
-        res_sendsigned.c res_findzonecut.c res_query.c res_mkquery.c	     \
-        ns_date.c ns_parse.c ns_sign.c ns_name.c ns_samedomain.c ns_verify.c
+SRCS=	ns_date.c ns_name.c ns_parse.c ns_samedomain.c ns_sign.c ns_verify.c \
+	res_comp.c res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \
+	res_query.c res_send.c res_sendsigned.c res_update.c
 
-CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR} -DHMAC_MD5 -DMINIRES_LIB
+CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB
+
+NOMAN=	true
 
 .include <bsd.lib.mk>
diff --git a/sbin/dhclient/omapip/Makefile b/sbin/dhclient/omapip/Makefile
index faee8f3ef888..5c1b0b6585fc 100644
--- a/sbin/dhclient/omapip/Makefile
+++ b/sbin/dhclient/omapip/Makefile
@@ -6,19 +6,14 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 .PATH: ${DIST_DIR}/omapip
 
 LIB=	 omapi
-NOPROFILE=		true
 INTERNALLIB=		true
-NOPIC=			true
 INTERNALSTATICLIB=	true
-NOMAN=			true
 
-SRCS=    protocol.c buffer.c alloc.c result.c connection.c errwarn.c \
-         listener.c dispatch.c generic.c support.c handle.c message.c \
-         convert.c hash.c auth.c inet_addr.c array.c trace.c mrtrace.c \
-         toisc.c
-
-CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
+SRCS=	alloc.c array.c auth.c buffer.c connection.c convert.c dispatch.c \
+	errwarn.c generic.c handle.c hash.c inet_addr.c listener.c \
+	message.c mrtrace.c protocol.c result.c support.c toisc.c trace.c
 
 MAN=	omapi.3
+NOMAN=	true
 
 .include <bsd.lib.mk>