12 files changed, 47 insertions, 94 deletions

diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc
index b8a3e558e15ce..715932527d0af 100644
--- a/gnu/usr.bin/man/Makefile.inc
+++ b/gnu/usr.bin/man/Makefile.inc
@@ -2,7 +2,6 @@
 # Set a bunch of things to hardcoded paths so that we don't accidently
 # pick up a user's own version of some utility and hose ourselves.
 #
-BINDIR?=		/usr/bin
 libdir=			/etc
 bindir=			${BINDIR}
 pager=			more -s
@@ -21,3 +20,13 @@ pic=			/usr/bin/pic
 zcat=			/usr/bin/zcat
 compress=		/usr/bin/gzip -c
 compext=		.gz
+
+.if exists(${.OBJDIR}/../lib)
+LIBDESTDIR=		${.OBJDIR}/../lib
+.else
+LIBDESTDIR=		${.CURDIR}/../lib
+.endif
+
+LIBMAN=	${LIBDESTDIR}/libman.a
+
+.include "../Makefile.inc"
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 86d61976198ad..ee856fe6795c7 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -5,14 +5,9 @@ BINOWN= man
 BINMODE=4555
 INSTALLFLAGS+= -fschg
 
-.if exists(${.OBJDIR}/../lib)
-LIBDESTDIR=	${.OBJDIR}/../lib
-.else
-LIBDESTDIR=	${.CURDIR}/../lib
-.endif
 CFLAGS+= -I${LIBDESTDIR}
-DPADD=	${LIBDESTDIR}/libman.a
-LDADD=	-L${LIBDESTDIR} -lman
+DPADD=	${LIBMAN}
+LDADD=	${LIBMAN}
 
 CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF
 CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0644
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index d3fa6b68901db..e8d3bf61cb582 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -2,13 +2,8 @@ PROG=	manpath
 SRCS=	manpath.c
 MAN1=	manpath.1
 
-.if exists(${.OBJDIR}/../lib)
-LIBDESTDIR=	${.OBJDIR}/../lib
-.else
-LIBDESTDIR=	${.CURDIR}/../lib
-.endif
-DPADD=	${LIBDESTDIR}/libman.a
-LDADD=	-L${LIBDESTDIR} -lman
+DPADD=	${LIBMAN}
+LDADD=	${LIBMAN}
 
 CFLAGS+= -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS
 CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.OBJDIR}/../lib
diff --git a/usr.sbin/xntpd/Makefile.inc b/usr.sbin/xntpd/Makefile.inc
index 906b5c6fb18b2..571be3424dadb 100644
--- a/usr.sbin/xntpd/Makefile.inc
+++ b/usr.sbin/xntpd/Makefile.inc
@@ -8,10 +8,16 @@ CLOCKDEFS= -DLOCAL_CLOCK -DPST -DWWVB -DAS2201 -DGOES -DGPSTM -DOMEGA \
 	-DLEITCH -DTRAK -DACTS -DATOM -DDATUM -DHEATH -DMSFEES \
 	-DMX4200 -DNMEA -DBOEDER
 CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${AUTHDEFS} ${CLOCKDEFS} ${COPTS}
-BINDIR?= /usr/sbin
+
+.if exists(${.OBJDIR}/../lib)
+LIBNTP=	${.OBJDIR}/../lib/libntp.a
+.else
+LIBNTP=	${.CURDIR}/../lib/libntp.a
+.endif
 
 .if !defined(NOCRYPT) && exists(${.CURDIR}/../../../secure/usr.sbin/xntpd/lib)
 AUTHDEFS+=	-DDES
 .endif
 
+.include "../Makefile.inc"
 .endif
diff --git a/usr.sbin/xntpd/authstuff/Makefile b/usr.sbin/xntpd/authstuff/Makefile
index db0b5eb942461..13d86f581fee0 100644
--- a/usr.sbin/xntpd/authstuff/Makefile
+++ b/usr.sbin/xntpd/authstuff/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.5 1997/02/22 16:14:15 peter Exp $
 #
 # Most of the programs in this directory are completely useless for the
 # NTP configuration that we provide by default.
@@ -7,15 +7,8 @@
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib
-DPADD+= ${.OBJDIR}/../lib/libntp.a
-.else
-LDADD+= -L${.CURDIR}/../lib
-DPADD+= ${.CURDIR}/../lib/libntp.a
-.endif
-
-LDADD+= -lntp
+DPADD=	${LIBNTP}
+LDADD=	${LIBNTP}
 
 PROG= md5
 
diff --git a/usr.sbin/xntpd/clockstuff/Makefile b/usr.sbin/xntpd/clockstuff/Makefile
index a41a791e47451..5dfc4ca86215c 100644
--- a/usr.sbin/xntpd/clockstuff/Makefile
+++ b/usr.sbin/xntpd/clockstuff/Makefile
@@ -1,10 +1,10 @@
 #
-# $Id$
+# $Id: Makefile,v 1.4 1997/02/22 16:14:17 peter Exp $
 #
 
 PROG= propdelay
-LDADD+= -L${.CURDIR}/../lib -lntp -lm
-DPADD+= ${.CURDIR}/../lib/libntp.a ${LIBM}
+DPADD=	${LIBNTP} ${LIBM}
+LDADD=	${LIBNTP} -lm
 
 SRCS= propdelay.c
 NOMAN=
diff --git a/usr.sbin/xntpd/ntpdate/Makefile b/usr.sbin/xntpd/ntpdate/Makefile
index ac333ca7d1006..1f436b30e55ab 100644
--- a/usr.sbin/xntpd/ntpdate/Makefile
+++ b/usr.sbin/xntpd/ntpdate/Makefile
@@ -1,18 +1,11 @@
 #
-# $Id$
+# $Id: Makefile,v 1.8 1997/02/22 16:14:26 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib
-DPADD+= ${.OBJDIR}/../lib/libntp.a
-.else
-LDADD+= -L${.CURDIR}/../lib
-DPADD+= ${.CURDIR}/../lib/libntp.a
-.endif
-
-LDADD+= -lntp
+DPADD=	${LIBNTP}
+LDADD=	${LIBNTP}
 
 PROG= ntpdate
 MAN8= ${.CURDIR}/../doc/ntpdate.8
diff --git a/usr.sbin/xntpd/ntpq/Makefile b/usr.sbin/xntpd/ntpq/Makefile
index ea643d21aedbc..446a55bdfd430 100644
--- a/usr.sbin/xntpd/ntpq/Makefile
+++ b/usr.sbin/xntpd/ntpq/Makefile
@@ -1,18 +1,11 @@
 #
-# $Id$
+# $Id: Makefile,v 1.8 1997/02/22 16:14:28 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib
-DPADD+= ${.OBJDIR}/../lib/libntp.a
-.else
-LDADD+= -L${.CURDIR}/../lib
-DPADD+= ${.CURDIR}/../lib/libntp.a
-.endif
-
-LDADD+= -lntp
+DPADD=	${LIBNTP}
+LDADD=	${LIBNTP}
 
 PROG= ntpq
 MAN8= ${.CURDIR}/../doc/ntpq.8
diff --git a/usr.sbin/xntpd/ntptrace/Makefile b/usr.sbin/xntpd/ntptrace/Makefile
index e1e2bd06204ec..c4efa8e7a81f8 100644
--- a/usr.sbin/xntpd/ntptrace/Makefile
+++ b/usr.sbin/xntpd/ntptrace/Makefile
@@ -1,18 +1,11 @@
 #
-# $Id$
+# $Id: Makefile,v 1.7 1997/02/22 16:14:30 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib
-DPADD+= ${.OBJDIR}/../lib/libntp.a
-.else
-LDADD+= -L${.CURDIR}/../lib
-DPADD+= ${.CURDIR}/../lib/libntp.a
-.endif
-
-LDADD+= -lntp
+DPADD=	${LIBNTP}
+LDADD=	${LIBNTP}
 
 PROG= ntptrace
 MAN8= ${.CURDIR}/../doc/ntptrace.8
diff --git a/usr.sbin/xntpd/util/Makefile b/usr.sbin/xntpd/util/Makefile
index e14a1c01b8f66..719f9b46713a9 100644
--- a/usr.sbin/xntpd/util/Makefile
+++ b/usr.sbin/xntpd/util/Makefile
@@ -1,18 +1,11 @@
 #
-# $Id$
+# $Id: Makefile,v 1.7 1997/02/22 16:14:37 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib
-DPADD+= ${.OBJDIR}/../lib/libntp.a
-.else
-LDADD+= -L${.CURDIR}/../lib
-DPADD+= ${.CURDIR}/../lib/libntp.a
-.endif
-
-LDADD+= -lntp
+DPADD=	${LIBNTP}
+LDADD=	${LIBNTP}
 
 PROG= tickadj
 MAN8= ${.CURDIR}/../doc/tickadj.8
diff --git a/usr.sbin/xntpd/xntpd/Makefile b/usr.sbin/xntpd/xntpd/Makefile
index aee14ea974f97..63877d4c8d171 100644
--- a/usr.sbin/xntpd/xntpd/Makefile
+++ b/usr.sbin/xntpd/xntpd/Makefile
@@ -1,27 +1,17 @@
 #
-# $Id$
+# $Id: Makefile,v 1.11 1997/02/22 16:14:39 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib
-DPADD+= ${.OBJDIR}/../lib/libntp.a
-.else
-LDADD+= -L${.CURDIR}/../lib
-DPADD+= ${.CURDIR}/../lib/libntp.a
-.endif
-
 .if exists(${.OBJDIR}/../parse)
-LDADD+= -L${.OBJDIR}/../parse
-DPADD+= ${.OBJDIR}/../parse/libparse.a
+LIBPARSE= ${.OBJDIR}/../parse/libparse.a
 .else
-LDADD+= -L${.CURDIR}/../parse
-DPADD+= ${.CURDIR}/../parse/libparse.a
+LIBPARSE= ${.CURDIR}/../parse/libparse.a
 .endif
 
-LDADD+= -lntp -lparse -lkvm
-DPADD+= ${LIBKVM}
+DPADD=	${LIBNTP} ${LIBPARSE} ${LIBKVM}
+LDADD=	${LIBNTP} ${LIBPARSE} -lkvm
 
 PROG= xntpd
 MAN8= ${.CURDIR}/../doc/xntpd.8
diff --git a/usr.sbin/xntpd/xntpdc/Makefile b/usr.sbin/xntpd/xntpdc/Makefile
index 5f545e1f1b85d..c830b53cbb350 100644
--- a/usr.sbin/xntpd/xntpdc/Makefile
+++ b/usr.sbin/xntpd/xntpdc/Makefile
@@ -1,18 +1,11 @@
 #
-# $Id$
+# $Id: Makefile,v 1.7 1997/02/22 16:14:43 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib
-DPADD+= ${.OBJDIR}/../lib/libntp.a
-.else
-LDADD+= -L${.CURDIR}/../lib
-DPADD+= ${.CURDIR}/../lib/libntp.a
-.endif
-
-LDADD+= -lntp
+DPADD=	${LIBNTP}
+LDADD=	${LIBNTP}
 
 PROG= xntpdc
 MAN8= ${.CURDIR}/../doc/xntpdc.8