diff options
author | bde <bde@FreeBSD.org> | 1998-03-07 09:46:17 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-03-07 09:46:17 +0000 |
commit | adad8e3b30af68187200b507357e3fcf43100f33 (patch) | |
tree | f6d250a819369feea99b47c546189a0b338a047d /usr.sbin/xntpd | |
parent | c21943079af6285bee92785769644542de555f3f (diff) | |
download | FreeBSD-src-adad8e3b30af68187200b507357e3fcf43100f33.zip FreeBSD-src-adad8e3b30af68187200b507357e3fcf43100f33.tar.gz |
Use `foo/bar.a' instead of `-Lfoo -lbar' for linking to static internal
libraries so that `ld -f' in can create correct dependencies for
yet-to-be-built libraries.
Get the default BINDIR correctly (by including ../Makefile.inc recursively.
Diffstat (limited to 'usr.sbin/xntpd')
-rw-r--r-- | usr.sbin/xntpd/Makefile.inc | 8 | ||||
-rw-r--r-- | usr.sbin/xntpd/authstuff/Makefile | 13 | ||||
-rw-r--r-- | usr.sbin/xntpd/clockstuff/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/xntpd/ntpdate/Makefile | 13 | ||||
-rw-r--r-- | usr.sbin/xntpd/ntpq/Makefile | 13 | ||||
-rw-r--r-- | usr.sbin/xntpd/ntptrace/Makefile | 13 | ||||
-rw-r--r-- | usr.sbin/xntpd/util/Makefile | 13 | ||||
-rw-r--r-- | usr.sbin/xntpd/xntpd/Makefile | 20 | ||||
-rw-r--r-- | usr.sbin/xntpd/xntpdc/Makefile | 13 |
9 files changed, 33 insertions, 79 deletions
diff --git a/usr.sbin/xntpd/Makefile.inc b/usr.sbin/xntpd/Makefile.inc index 906b5c6..571be34 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 db0b5eb..13d86f5 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 a41a791..5dfc4ca 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 ac333ca..1f436b3 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 ea643d2..446a55b 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 e1e2bd0..c4efa8e 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 e14a1c0..719f9b4 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 aee14ea..63877d4 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 5f545e1..c830b53 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 |