diff options
author | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
commit | 388e590f951441f619cd32710dc151e0ac810a10 (patch) | |
tree | 801e953598fc63a37f62cf997017301675552fe9 /usr.sbin/ntp | |
parent | a251964eaca5833ff2c4651fe4f7f8cac7199da5 (diff) | |
download | FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.zip FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.tar.gz |
Reimplementation of world/kernel build options. For details, see:
http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html
The src.conf(5) manpage is to follow in a few days.
Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)
Diffstat (limited to 'usr.sbin/ntp')
-rw-r--r-- | usr.sbin/ntp/Makefile.inc | 4 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/ntp/ntp-keygen/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/ntp/ntpd/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/ntp/ntpdc/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/ntp/ntpq/Makefile | 7 |
6 files changed, 26 insertions, 10 deletions
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index 3a85910..dee6598 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H NTPDEFS= -DSYS_FREEBSD # CLOCKDEFS= @@ -8,7 +10,7 @@ NTPDEFS= -DSYS_FREEBSD # -DMX4200 -DNMEA -DBOEDER CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) CFLAGS+= -DOPENSSL .endif diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile index d49a0db..7788094 100644 --- a/usr.sbin/ntp/doc/Makefile +++ b/usr.sbin/ntp/doc/Makefile @@ -1,8 +1,10 @@ # $FreeBSD$ +.include <bsd.own.mk> + FILESDIR= ${SHAREDIR}/doc/ntp -.if !defined(NO_HTML) +.if ${MK_HTML} != "no" FILES= accopt.html assoc.html audio.html authopt.html build.html \ clockopt.html \ config.html confopt.html copyright.html debug.html driver1.html \ diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index 7ccdee2..5211b6f 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -1,17 +1,20 @@ # $FreeBSD$ +NO_MAN= + +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../../contrib/ntp/util \ ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntp-keygen -NO_MAN= CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ DPADD= ${LIBNTP} LDADD= ${LIBNTP} -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) DPADD+= ${LIBMD} ${LIBCRYPTO} LDADD+= -lmd -lcrypto .endif diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 5b3fdba..82c99c8 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -1,9 +1,12 @@ # $FreeBSD$ +NO_MAN= + +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntpd -NO_MAN= SRCS= cmd_args.c map_vme.c ntp_config.c \ ntp_control.c ntp_crypto.c ntp_filegen.c \ ntp_intres.c ntp_io.c ntp_loopfilter.c \ @@ -31,7 +34,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto .endif diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 730308c..1e42b43 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -1,9 +1,12 @@ # $FreeBSD$ +NO_MAN= + +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc PROG= ntpdc -NO_MAN= SRCS= ntpdc.c ntpdc_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ @@ -11,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ DPADD= ${LIBNTP} ${LIBMD} LDADD= ${LIBNTP} -lmd -.if !defined(NO_GNU) +.if ${MK_GNU_SUPPORT} != "no" DPADD+= ${LIBREADLINE} ${LIBTERMCAP} LDADD+= -lreadline -ltermcap CFLAGS+= -DHAVE_LIBREADLINE -DHAVE_READLINE_HISTORY_H \ diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 613e02e..6e749d6 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -1,11 +1,14 @@ # $FreeBSD$ +NO_MAN= + +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../../contrib/ntp/ntpq BINDIR= /usr/bin PROG= ntpq -NO_MAN= SRCS= ntpq.c ntpq_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ @@ -13,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ DPADD= ${LIBNTP} ${LIBMD} LDADD= ${LIBNTP} -lmd -.if !defined(NO_GNU) +.if ${MK_GNU_SUPPORT} != "no" DPADD+= ${LIBREADLINE} ${LIBTERMCAP} LDADD+= -lreadline -ltermcap CFLAGS+= -DHAVE_LIBREADLINE -DHAVE_READLINE_HISTORY_H \ |