summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/xntpd/authstuff/Makefile17
-rw-r--r--usr.sbin/xntpd/lib/Makefile5
-rw-r--r--usr.sbin/xntpd/ntpdate/Makefile14
-rw-r--r--usr.sbin/xntpd/ntpq/Makefile14
-rw-r--r--usr.sbin/xntpd/ntptrace/Makefile14
-rw-r--r--usr.sbin/xntpd/util/Makefile14
-rw-r--r--usr.sbin/xntpd/xntpd/Makefile26
-rw-r--r--usr.sbin/xntpd/xntpdc/Makefile14
-rw-r--r--usr.sbin/xntpd/xntpres/Makefile14
9 files changed, 103 insertions, 29 deletions
diff --git a/usr.sbin/xntpd/authstuff/Makefile b/usr.sbin/xntpd/authstuff/Makefile
index 2920264..79b2d9d 100644
--- a/usr.sbin/xntpd/authstuff/Makefile
+++ b/usr.sbin/xntpd/authstuff/Makefile
@@ -1,15 +1,24 @@
#
-# $Id$
+# $Id: Makefile,v 1.1 1993/12/21 21:06:20 wollman Exp $
#
# Most of the programs in this directory are completely useless for the
# NTP configuration that we provide by default.
# We provide the `md5' program as a public service.
-PROG= md5
-LDADD+= -L${.CURDIR}/../lib -lntp
-DPADD+= ${.CURDIR}/../lib/libntp.a
CFLAGS+= -I${.CURDIR}/../include
+.if exists(${.CURDIR}/../lib/obj)
+LDADD+= -L${.CURDIR}/../lib/obj
+DPADD+= ${.CURDIR}/../lib/obj/libntp.a
+.else
+LDADD+= -L${.CURDIR}/../lib
+DPADD+= ${.CURDIR}/../lib/libntp.a
+.endif
+
+LDADD+= -lntp
+
+PROG= md5
+
SRCS= md5driver.c
NOMAN=
diff --git a/usr.sbin/xntpd/lib/Makefile b/usr.sbin/xntpd/lib/Makefile
index 687cfc8..a109ee2 100644
--- a/usr.sbin/xntpd/lib/Makefile
+++ b/usr.sbin/xntpd/lib/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.2 1993/12/21 20:16:46 wollman Exp $
+# $Id: Makefile,v 1.3 1993/12/21 21:06:27 wollman Exp $
#
CFLAGS+= -I${.CURDIR}/../include
@@ -20,10 +20,11 @@ SRCS= atoint.c atolfp.c atouint.c auth12crypt.c authdecrypt.c authdes.c \
NOMAN=
NOPROFILE=
LIB= ntp
+CLEANFILES+=authdes.c
install:
authdes.c: authdes.c.export
- cp authdes.c.export authdes.c
+ cp ${.CURDIR}/authdes.c.export authdes.c
.include <bsd.lib.mk>
diff --git a/usr.sbin/xntpd/ntpdate/Makefile b/usr.sbin/xntpd/ntpdate/Makefile
index 53a5483..3a1b68b 100644
--- a/usr.sbin/xntpd/ntpdate/Makefile
+++ b/usr.sbin/xntpd/ntpdate/Makefile
@@ -1,14 +1,22 @@
#
-# $Id: Makefile,v 1.1 1993/12/21 19:40:50 wollman Exp $
+# $Id: Makefile,v 1.2 1993/12/21 21:06:30 wollman Exp $
#
CFLAGS+= -I${.CURDIR}/../include
-LDADD+= -L${.CURDIR}/../lib -lntp
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD+= -L${.CURDIR}/../lib/obj
+DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.else
+LDADD+= -L${.CURDIR}/../lib
DPADD+= -L${.CURDIR}/../lib/libntp.a
+.endif
+
+LDADD+= -lntp
PROG= ntpdate
MAN8= ${.CURDIR}/../doc/ntpdate.8
-CLEANFILES+= version.c
+CLEANFILES+= .version version.c
SRCS= ntpdate.c version.c
diff --git a/usr.sbin/xntpd/ntpq/Makefile b/usr.sbin/xntpd/ntpq/Makefile
index 95a56aa..4fc41c4 100644
--- a/usr.sbin/xntpd/ntpq/Makefile
+++ b/usr.sbin/xntpd/ntpq/Makefile
@@ -1,14 +1,22 @@
#
-# $Id: Makefile,v 1.1 1993/12/21 19:46:16 wollman Exp $
+# $Id: Makefile,v 1.2 1993/12/21 21:06:32 wollman Exp $
#
CFLAGS+= -I${.CURDIR}/../include
-LDADD+= -L${.CURDIR}/../lib -lntp
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD+= -L${.CURDIR}/../lib/obj
+DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.else
+LDADD+= -L${.CURDIR}/../lib
DPADD+= -L${.CURDIR}/../lib/libntp.a
+.endif
+
+LDADD+= -lntp
PROG= ntpq
MAN8= ${.CURDIR}/../doc/ntpq.8
-CLEANFILES+= version.c
+CLEANFILES+= .version version.c
BINDIR= /usr/bin
SRCS= ntpq.c ntpq_ops.c version.c
diff --git a/usr.sbin/xntpd/ntptrace/Makefile b/usr.sbin/xntpd/ntptrace/Makefile
index 193d83f..57f3051 100644
--- a/usr.sbin/xntpd/ntptrace/Makefile
+++ b/usr.sbin/xntpd/ntptrace/Makefile
@@ -1,14 +1,22 @@
#
-# $Id: Makefile,v 1.1 1993/12/21 19:46:16 wollman Exp $
+# $Id: Makefile,v 1.1 1993/12/21 19:50:40 wollman Exp $
#
CFLAGS+= -I${.CURDIR}/../include
-LDADD+= -L${.CURDIR}/../lib -lntp
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD+= -L${.CURDIR}/../lib/obj
+DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.else
+LDADD+= -L${.CURDIR}/../lib
DPADD+= -L${.CURDIR}/../lib/libntp.a
+.endif
+
+LDADD+= -lntp
PROG= ntptrace
MAN8= ${.CURDIR}/../doc/ntptrace.8
-CLEANFILES+= version.c
+CLEANFILES+= .version version.c
SRCS= ntptrace.c version.c
diff --git a/usr.sbin/xntpd/util/Makefile b/usr.sbin/xntpd/util/Makefile
index a030fc8..ce9e1fd 100644
--- a/usr.sbin/xntpd/util/Makefile
+++ b/usr.sbin/xntpd/util/Makefile
@@ -1,14 +1,22 @@
#
-# $Id: Makefile,v 1.1 1993/12/21 19:50:40 wollman Exp $
+# $Id: Makefile,v 1.1 1993/12/21 20:16:18 wollman Exp $
#
CFLAGS+= -I${.CURDIR}/../include
-LDADD+= -L${.CURDIR}/../lib -lntp
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD+= -L${.CURDIR}/../lib/obj
+DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.else
+LDADD+= -L${.CURDIR}/../lib
DPADD+= -L${.CURDIR}/../lib/libntp.a
+.endif
+
+LDADD+= -lntp
PROG= tickadj
MAN8= ${.CURDIR}/../doc/tickadj.8
-CLEANFILES+= version.c
+CLEANFILES+= .version version.c
SRCS= tickadj.c version.c
diff --git a/usr.sbin/xntpd/xntpd/Makefile b/usr.sbin/xntpd/xntpd/Makefile
index daffcdf..ccaf6c1 100644
--- a/usr.sbin/xntpd/xntpd/Makefile
+++ b/usr.sbin/xntpd/xntpd/Makefile
@@ -1,14 +1,30 @@
#
-# $Id: Makefile,v 1.1 1993/12/21 20:16:18 wollman Exp $
+# $Id: Makefile,v 1.1 1993/12/21 21:06:54 wollman Exp $
#
CFLAGS+= -I${.CURDIR}/../include
-LDADD+= -L${.CURDIR}/../lib -lntp -L${.CURDIR}/../parse -lparse
-DPADD+= ${.CURDIR}/../lib/libntp.a ${.CURDIR}/../parse/libparse.a
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD+= -L${.CURDIR}/../lib/obj
+DPADD+= ${.CURDIR}/../lib/obj/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
+.else
+LDADD+= -L${.CURDIR}/../parse
+DPADD+= ${.CURDIR}/../parse/libparse.a
+.endif
+
+LDADD+= -lntp -lparse
PROG= xntpd
MAN8= ${.CURDIR}/../doc/xntpd.8
-CLEANFILES+= version.c
+CLEANFILES+= .version version.c
SRCS= ntp_config.c ntp_control.c ntp_io.c ntp_leap.c \
ntp_loopfilter.c ntp_monitor.c ntp_peer.c ntp_proto.c \
@@ -16,7 +32,7 @@ SRCS= ntp_config.c ntp_control.c ntp_io.c ntp_leap.c \
ntp_unixclock.c ntp_util.c ntpd.c refclock_chu.c \
refclock_conf.c refclock_local.c refclock_pst.c \
refclock_wwvb.c refclock_goes.c refclock_mx4200.c \
- refclock_parse.c refclock_as2201.c refclock_omega.c \
+ refclock_parse.c refclock_as2201.c \
refclock_tpro.c refclock_leitch.c refclock_irig.c \
refclock_msfees.c ntp_intres.c ntp_filegen.c version.c
diff --git a/usr.sbin/xntpd/xntpdc/Makefile b/usr.sbin/xntpd/xntpdc/Makefile
index cb09569..4f40d70 100644
--- a/usr.sbin/xntpd/xntpdc/Makefile
+++ b/usr.sbin/xntpd/xntpdc/Makefile
@@ -1,14 +1,22 @@
#
-# $Id: Makefile,v 1.1 1993/12/21 19:46:16 wollman Exp $
+# $Id: Makefile,v 1.1 1993/12/21 20:36:45 wollman Exp $
#
CFLAGS+= -I${.CURDIR}/../include
-LDADD+= -L${.CURDIR}/../lib -lntp
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD+= -L${.CURDIR}/../lib/obj
+DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.else
+LDADD+= -L${.CURDIR}/../lib
DPADD+= -L${.CURDIR}/../lib/libntp.a
+.endif
+
+LDADD+= -lntp
PROG= xntpdc
MAN8= ${.CURDIR}/../doc/xntpdc.8
-CLEANFILES+= version.c
+CLEANFILES+= .version version.c
SRCS= ntpdc.c ntpdc_ops.c version.c
diff --git a/usr.sbin/xntpd/xntpres/Makefile b/usr.sbin/xntpd/xntpres/Makefile
index ecead3c..fc41047 100644
--- a/usr.sbin/xntpd/xntpres/Makefile
+++ b/usr.sbin/xntpd/xntpres/Makefile
@@ -1,14 +1,22 @@
#
-# $Id: Makefile,v 1.1 1993/12/21 19:50:40 wollman Exp $
+# $Id: Makefile,v 1.1 1993/12/21 20:38:27 wollman Exp $
#
CFLAGS+= -I${.CURDIR}/../include
-LDADD+= -L${.CURDIR}/../lib -lntp
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD+= -L${.CURDIR}/../lib/obj
+DPADD+= -L${.CURDIR}/../lib/obj/libntp.a
+.else
+LDADD+= -L${.CURDIR}/../lib
DPADD+= -L${.CURDIR}/../lib/libntp.a
+.endif
+
+LDADD+= -lntp
PROG= xntpres
NOMAN=
-CLEANFILES+= version.c
+CLEANFILES+= .version version.c
SRCS= xntpres.c version.c
OpenPOWER on IntegriCloud