Bring in my changes for removing the pestilent obj links (unless you

really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.

8 files changed, 35 insertions, 35 deletions

diff --git a/usr.sbin/xntpd/authstuff/Makefile b/usr.sbin/xntpd/authstuff/Makefile
index 79b2d9d..902848f 100644
--- a/usr.sbin/xntpd/authstuff/Makefile
+++ b/usr.sbin/xntpd/authstuff/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 1993/12/21 21:06:20 wollman Exp $
+# $Id: Makefile,v 1.2 1993/12/22 11:32:10 rgrimes Exp $
 #
 # Most of the programs in this directory are completely useless for the
 # NTP configuration that we provide by default.
@@ -7,9 +7,9 @@
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj
-DPADD+= ${.CURDIR}/../lib/obj/libntp.a
+.if exists(${.OBJDIR}/../lib)
+LDADD+= -L${.OBJDIR}/../lib
+DPADD+= ${.OBJDIR}/../lib/libntp.a
 .else
 LDADD+= -L${.CURDIR}/../lib
 DPADD+= ${.CURDIR}/../lib/libntp.a
diff --git a/usr.sbin/xntpd/ntpdate/Makefile b/usr.sbin/xntpd/ntpdate/Makefile
index f0af840..d1a9dd9 100644
--- a/usr.sbin/xntpd/ntpdate/Makefile
+++ b/usr.sbin/xntpd/ntpdate/Makefile
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile,v 1.3 1993/12/22 11:32:56 rgrimes Exp $
+# $Id: Makefile,v 1.4 1994/10/03 23:51:17 phk Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj
-DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.if exists(${.OBJDIR}/../lib)
+LDADD+= -L${.OBJDIR}/../lib
+DPADD+= -L${.OBJDIR}/../lib/libntp.a
 .else
 LDADD+= -L${.CURDIR}/../lib
 DPADD+= -L${.CURDIR}/../lib/libntp.a
diff --git a/usr.sbin/xntpd/ntpq/Makefile b/usr.sbin/xntpd/ntpq/Makefile
index 875592a..4ba9f07 100644
--- a/usr.sbin/xntpd/ntpq/Makefile
+++ b/usr.sbin/xntpd/ntpq/Makefile
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile,v 1.3 1993/12/22 11:33:07 rgrimes Exp $
+# $Id: Makefile,v 1.4 1994/10/03 23:51:22 phk Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj
-DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.if exists(${.OBJDIR}/../lib)
+LDADD+= -L${.OBJDIR}/../lib
+DPADD+= -L${.OBJDIR}/../lib/libntp.a
 .else
 LDADD+= -L${.CURDIR}/../lib
 DPADD+= -L${.CURDIR}/../lib/libntp.a
diff --git a/usr.sbin/xntpd/ntptrace/Makefile b/usr.sbin/xntpd/ntptrace/Makefile
index 5d5f327..1334dfd 100644
--- a/usr.sbin/xntpd/ntptrace/Makefile
+++ b/usr.sbin/xntpd/ntptrace/Makefile
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile,v 1.2 1993/12/22 11:33:14 rgrimes Exp $
+# $Id: Makefile,v 1.3 1994/10/03 23:51:26 phk Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj
-DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.if exists(${.OBJDIR}/../lib)
+LDADD+= -L${.OBJDIR}/../lib
+DPADD+= -L${.OBJDIR}/../lib/libntp.a
 .else
 LDADD+= -L${.CURDIR}/../lib
 DPADD+= -L${.CURDIR}/../lib/libntp.a
diff --git a/usr.sbin/xntpd/parse/util/Makefile b/usr.sbin/xntpd/parse/util/Makefile
index ad9c0eb..a05ca08 100644
--- a/usr.sbin/xntpd/parse/util/Makefile
+++ b/usr.sbin/xntpd/parse/util/Makefile
@@ -1,14 +1,14 @@
 #
-# $Id$
+# $Id: Makefile,v 1.2 1995/04/04 17:48:02 rgrimes Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../../include
 CFLAGS+= -DNTP_POSIX_SOURCE -DUSE_PROTOTYPES
 CFLAGS+= -DSYS_FREEBSD -DBOEDER -DHAVE_TERMIOS -DHAVE_BSD_NICE
 
-.if exists(${.CURDIR}/../../lib/obj)
-LDADD+= -L${.CURDIR}/../../lib/obj
-DPADD+= -L${.CURDIR}/../../lib/obj/libntp.a
+.if exists(${.OBJDIR}/../../lib)
+LDADD+= -L${.OBJDIR}/../../lib
+DPADD+= -L${.OBJDIR}/../../lib/libntp.a
 .else
 LDADD+= -L${.CURDIR}/../../lib
 DPADD+= -L${.CURDIR}/../../lib/libntp.a
diff --git a/usr.sbin/xntpd/util/Makefile b/usr.sbin/xntpd/util/Makefile
index 02cb294..04f3587 100644
--- a/usr.sbin/xntpd/util/Makefile
+++ b/usr.sbin/xntpd/util/Makefile
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile,v 1.2 1993/12/22 11:33:28 rgrimes Exp $
+# $Id: Makefile,v 1.3 1994/10/03 23:51:29 phk Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj
-DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.if exists(${.OBJDIR}/../lib)
+LDADD+= -L${.OBJDIR}/../lib
+DPADD+= -L${.OBJDIR}/../lib/libntp.a
 .else
 LDADD+= -L${.CURDIR}/../lib
 DPADD+= -L${.CURDIR}/../lib/libntp.a
diff --git a/usr.sbin/xntpd/xntpd/Makefile b/usr.sbin/xntpd/xntpd/Makefile
index 6ab7cd0..a1de730 100644
--- a/usr.sbin/xntpd/xntpd/Makefile
+++ b/usr.sbin/xntpd/xntpd/Makefile
@@ -1,20 +1,20 @@
 #
-# $Id: Makefile,v 1.6 1994/09/30 00:34:17 wollman Exp $
+# $Id: Makefile,v 1.7 1994/10/03 23:51:32 phk Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj
-DPADD+= ${.CURDIR}/../lib/obj/libntp.a
+.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(${.CURDIR}/../parse/obj)
-LDADD+= -L${.CURDIR}/../parse/obj
-DPADD+= ${.CURDIR}/../parse/obj/libparse.a
+.if exists(${.OBJDIR}/../parse)
+LDADD+= -L${.OBJDIR}/../parse
+DPADD+= ${.OBJDIR}/../parse/libparse.a
 .else
 LDADD+= -L${.CURDIR}/../parse
 DPADD+= ${.CURDIR}/../parse/libparse.a
diff --git a/usr.sbin/xntpd/xntpdc/Makefile b/usr.sbin/xntpd/xntpdc/Makefile
index a06cf1a..2543074 100644
--- a/usr.sbin/xntpd/xntpdc/Makefile
+++ b/usr.sbin/xntpd/xntpdc/Makefile
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile,v 1.2 1993/12/22 11:34:00 rgrimes Exp $
+# $Id: Makefile,v 1.3 1994/10/03 23:51:34 phk Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
 
-.if exists(${.CURDIR}/../lib/obj)
-LDADD+= -L${.CURDIR}/../lib/obj
-DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.if exists(${.OBJDIR}/../lib)
+LDADD+= -L${.OBJDIR}/../lib
+DPADD+= -L${.OBJDIR}/../lib/libntp.a
 .else
 LDADD+= -L${.CURDIR}/../lib
 DPADD+= -L${.CURDIR}/../lib/libntp.a