diff options
| author | roberto <roberto@FreeBSD.org> | 2008-08-22 16:00:48 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2008-08-22 16:00:48 +0000 |
| commit | e01fe39f04056ee9114cad5f8fcceafa3856c80c (patch) | |
| tree | 09f1e02ba3375bb9d3a329705c08f20103f72e74 /usr.sbin/ntp/ntpd/Makefile | |
| parent | b85c7169a740b2edf0106ad59fdaa1b0160f823c (diff) | |
| download | FreeBSD-src-e01fe39f04056ee9114cad5f8fcceafa3856c80c.zip FreeBSD-src-e01fe39f04056ee9114cad5f8fcceafa3856c80c.tar.gz | |
Update the various files to sync with vendor import of 4.2.4p5.
sntp includes a copy of libopts in itself in vendor code, rewrite the
Makefile to compile and use only one copy. It is an internal library, not
installed.
MFC after: 2 weeks
Diffstat (limited to 'usr.sbin/ntp/ntpd/Makefile')
| -rw-r--r-- | usr.sbin/ntp/ntpd/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 82c99c8..175ad67 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -7,7 +7,7 @@ NO_MAN= .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntpd -SRCS= cmd_args.c map_vme.c ntp_config.c \ +SRCS= cmd_args.c ntp_config.c \ ntp_control.c ntp_crypto.c ntp_filegen.c \ ntp_intres.c ntp_io.c ntp_loopfilter.c \ ntp_monitor.c ntp_peer.c ntp_proto.c \ @@ -23,16 +23,17 @@ SRCS= cmd_args.c map_vme.c ntp_config.c \ refclock_local.c refclock_msfees.c refclock_mx4200.c \ refclock_neoclock4x.c refclock_nmea.c refclock_oncore.c \ refclock_palisade.c refclock_parse.c refclock_pcf.c \ - refclock_pst.c refclock_ptbacts.c refclock_ripencc.c \ + refclock_pst.c refclock_ripencc.c \ refclock_shm.c refclock_tpro.c refclock_trak.c refclock_true.c \ - refclock_ulink.c refclock_usno.c refclock_wwv.c \ - refclock_wwvb.c \ + refclock_ulink.c refclock_wwv.c \ + refclock_wwvb.c ntpd-opts.c \ version.c -CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ +CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ + -I${.CURDIR}/../../../contrib/ntp/libopts -I${.CURDIR} -DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} -LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd +DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} ${LIBOPTS} +LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd -lrt ${LIBOPTS} .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) DPADD+= ${LIBCRYPTO} |
