From 4c49e2a210f8bc0655353edc2fdd9ceee7910d25 Mon Sep 17 00:00:00 2001 From: Ollivier Robert Date: Sat, 1 Jan 2000 23:58:01 +0000 Subject: - remove trace of libkvm. It is not used at all. - reorganise the Makefiles: the order of variables was not the usual one. Explained gently by: bde --- usr.sbin/ntp/libntp/Makefile | 4 ++-- usr.sbin/ntp/libparse/Makefile | 4 ++-- usr.sbin/ntp/ntpd/Makefile | 16 +++++++++------- usr.sbin/ntp/ntpdate/Makefile | 14 ++++++++------ usr.sbin/ntp/ntpdc/Makefile | 14 ++++++++------ usr.sbin/ntp/ntpq/Makefile | 16 +++++++++------- usr.sbin/ntp/ntptime/Makefile | 11 ++++++----- usr.sbin/ntp/ntptimeset/Makefile | 14 ++++++++------ usr.sbin/ntp/ntptrace/Makefile | 14 ++++++++------ 9 files changed, 60 insertions(+), 47 deletions(-) diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile index 15c46d7e3f948..0e18a6762ccfa 100644 --- a/usr.sbin/ntp/libntp/Makefile +++ b/usr.sbin/ntp/libntp/Makefile @@ -4,8 +4,6 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/libntp -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ - SRCS= a_md5encrypt.c adjtime.c atoint.c \ atolfp.c atouint.c authencrypt.c authkeys.c \ authparity.c authreadkeys.c authusekey.c binio.c \ @@ -24,6 +22,8 @@ SRCS= a_md5encrypt.c adjtime.c atoint.c \ tsftomsu.c tstotv.c tvtoa.c tvtots.c \ uglydate.c uinttoa.c utvtoa.c ymd2yd.c +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ + NOMAN= true NOPROFILE= true INTERNALLIB= true diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index ced28a89677bb..dd0b645a6c0b3 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -4,8 +4,6 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/libparse -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ - SRCS= parse.c parse_conf.c \ clk_computime.c clk_dcf7000.c clk_hopf6021.c \ clk_meinberg.c clk_rawdcf.c clk_rcc8000.c \ @@ -13,6 +11,8 @@ SRCS= parse.c parse_conf.c \ clk_varitext.c clk_wharton.c data_mbg.c \ info_trimble.c trim_info.c +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ + NOMAN= true NOPROFILE= true INTERNALLIB= true diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 0bff100fcbc7f..fd1e393308a60 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -4,14 +4,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ - -DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBKVM} -LDADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBKVM} - PROG= ntpd -NOMAN= yes -CLEANFILES+= .version version.c SRCS= map_vme.c ntp_config.c \ ntp_control.c ntp_filegen.c ntp_intres.c \ @@ -31,6 +24,15 @@ SRCS= map_vme.c ntp_config.c \ refclock_trak.c refclock_true.c refclock_usno.c \ refclock_wwvb.c version.c +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ + +NOMAN= yes + +DPADD= ${LIBPARSE} ${LIBNTP} -lm +LDADD= ${LIBPARSE} ${LIBNTP} -lm + +CLEANFILES+= .version version.c + version.c: sh -e ${.CURDIR}/../scripts/mkver ntpd diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile index 015b14d990585..22c7cf0afbd0e 100644 --- a/usr.sbin/ntp/ntpdate/Makefile +++ b/usr.sbin/ntp/ntpdate/Makefile @@ -4,16 +4,18 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +PROG= ntpdate -DPADD= ${LIBNTP} ${LIBKVM} -LDADD= ${LIBNTP} ${LIBKVM} +SRCS= ntpdate.c version.c + +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -PROG= ntpdate NOMAN= yes -CLEANFILES+= .version version.c -SRCS= ntpdate.c version.c +DPADD= ${LIBNTP} +LDADD= ${LIBNTP} + +CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntpdate diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 93d819467d24e..97756af2e821a 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -4,16 +4,18 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +PROG= ntpdc -DPADD= ${LIBNTP} ${LIBKVM} -LDADD= ${LIBNTP} ${LIBKVM} +SRCS= ntpdc.c ntpdc_ops.c version.c + +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -PROG= ntpdc NOMAN= yes -CLEANFILES+= .version version.c -SRCS= ntpdc.c ntpdc_ops.c version.c +DPADD= ${LIBNTP} +LDADD= ${LIBNTP} + +CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntpdc diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 551dbec6bdc41..29f16e0200fa5 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -4,18 +4,20 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpq -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ - -DPADD= ${LIBNTP} ${LIBKVM} -LDADD= ${LIBNTP} ${LIBKVM} - PROG= ntpq -NOMAN= yes -CLEANFILES+= .version version.c BINDIR= /usr/bin SRCS= ntpq.c ntpq_ops.c version.c +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ + +NOMAN= yes + +DPADD= ${LIBNTP} +LDADD= ${LIBNTP} + +CLEANFILES+= .version version.c + version.c: sh -e ${.CURDIR}/../scripts/mkver ntpq diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile index d4e45eb7ce3cc..6d57ec251769f 100644 --- a/usr.sbin/ntp/ntptime/Makefile +++ b/usr.sbin/ntp/ntptime/Makefile @@ -4,14 +4,15 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/util -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +PROG= ntptime -DPADD= ${LIBNTP} ${LIBKVM} -LDADD= ${LIBNTP} ${LIBKVM} +SRCS= ntptime.c + +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -PROG= ntptime NOMAN= yes -SRCS= ntptime.c +DPADD= ${LIBNTP} +LDADD= ${LIBNTP} .include diff --git a/usr.sbin/ntp/ntptimeset/Makefile b/usr.sbin/ntp/ntptimeset/Makefile index 80e421b41e8cf..7e2dc934de779 100644 --- a/usr.sbin/ntp/ntptimeset/Makefile +++ b/usr.sbin/ntp/ntptimeset/Makefile @@ -4,16 +4,18 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +PROG= ntptimeset -DPADD= ${LIBNTP} ${LIBKVM} -LDADD= ${LIBNTP} ${LIBKVM} +SRCS= ntptimeset.c ntptime_config.c version.c + +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -PROG= ntptimeset NOMAN= yes -CLEANFILES+= .version version.c -SRCS= ntptimeset.c ntptime_config.c version.c +DPADD= ${LIBNTP} +LDADD= ${LIBNTP} + +CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntptimeset diff --git a/usr.sbin/ntp/ntptrace/Makefile b/usr.sbin/ntp/ntptrace/Makefile index 219ae9b223d3c..9bb0bde604d28 100644 --- a/usr.sbin/ntp/ntptrace/Makefile +++ b/usr.sbin/ntp/ntptrace/Makefile @@ -4,16 +4,18 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntptrace -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +PROG= ntptrace -DPADD= ${LIBNTP} ${LIBKVM} -LDADD= ${LIBNTP} ${LIBKVM} +SRCS= ntptrace.c version.c + +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -PROG= ntptrace NOMAN= yes -CLEANFILES+= .version version.c -SRCS= ntptrace.c version.c +DPADD= ${LIBNTP} +LDADD= ${LIBNTP} + +CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntptrace -- cgit v1.3