[Bug 1832] ntpdate doesn't allow timeout > 2s.

[Bug 1833] The checking sem_timedwait() fails without -pthread.
Enable all relevant automake warnings.
Correct Solaris 2.1x PTHREAD_ONCE_INIT extra braces test to avoid
  triggering warnings due to excess braces.
Remove libevent-cfg from sntp/Makefile.am.
Provide bug report and URL options to Autoconf.

bk: 4d6352644OftmxzlN3pNJG89KQlcUw

diff --git a/ChangeLog b/ChangeLog
index c46764788549c5aac5e6a5b9a15929667c922967..871bd288ca9a2930dbdf58bce2d490eeec2911e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-* Remove libevent-cfg from sntp/Makefile.am .
+* [Bug 1832] ntpdate doesn't allow timeout > 2s.
+* [Bug 1833] The checking sem_timedwait() fails without -pthread.
+* Enable all relevant automake warnings.
+* Correct Solaris 2.1x PTHREAD_ONCE_INIT extra braces test to avoid
+  triggering warnings due to excess braces.
+* Remove libevent-cfg from sntp/Makefile.am.
+* Provide bug report and URL options to Autoconf.
 (4.2.7p131) 2011/02/21 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1087] -v/--normalverbose conflicts with -v/--version in sntp.
 * [Bug 1088] sntp should (only) report the time difference without -s/-a.

diff --git a/Makefile.am b/Makefile.am
index dfe97938283d027a6d7a5ef6db666d79abe63f2c..5254ea8c1c8bf0897117bc4489c9706f9da6e63e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
-## LIBOPTS_CHECK_NOBUILD works with Automake 1.10 now
-AUTOMAKE_OPTIONS = foreign 1.10
-ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/libopts/m4 -I sntp/libevent/m4
+ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/libevent/m4 -I sntp/libopts/m4
 
 NULL =
 

diff --git a/adjtimed/Makefile.am b/adjtimed/Makefile.am
index da83917f3d1d17f8cb11f1a82c17aa9e8fb61729..128dbb590d53fae6c48047e2f7ed34898343a7dc 100644 (file)
--- a/adjtimed/Makefile.am
+++ b/adjtimed/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS=      
+## adjtimed Makefile.am
 
 if NTP_BINSUBDIR_IS_BIN
 bin_PROGRAMS=  @MAKE_ADJTIMED@
@@ -10,17 +10,13 @@ BUILT_SOURCES= check-libntp
 CLEANFILES=
 EXTRA_PROGRAMS=        adjtimed
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
-LDADD=         ../libntp/libntp.a @LDADD_LIBNTP@ @PTHREAD_LIBS@
-ETAGS_ARGS=    Makefile.am
+LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
 
 check-libntp: FRC
        cd ../libntp && $(MAKE)
@@ -29,3 +25,4 @@ FRC:
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am
index 96dca24a5c79c29952989e22d3fbf2bdea8d8f30..7f4f1e5109a73f5407fca8252640fae6d763dc38 100644 (file)
--- a/clockstuff/Makefile.am
+++ b/clockstuff/Makefile.am
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS =
 noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
 EXTRA_PROGRAMS = propdelay chutest clktest
 
@@ -7,16 +6,13 @@ EXTRA_DIST = clktest-opts.def
 
 clktest_SOURCES = clktest.c clktest-opts.c clktest-opts.h
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
-LDADD = ../libntp/libntp.a @LDADD_LIBNTP@ @PTHREAD_LIBS@
+LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
 propdelay_LDADD = $(LIBM) $(LDADD)
 
 run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
@@ -47,4 +43,6 @@ FRC:
        cd ../libntp && $(MAKE)
 
 CLEANFILES =
+
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/configure.ac b/configure.ac
index e4dd2d98c76262cfaaab3169bd41f7f983bccad0..3d9d0b79c8c058c9b08f8f92d7e1aa2918914a23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,14 @@
-dnl -*-fundamental-*-
-dnl Process this file with autoconf to produce a configure script.
+dnl NTP top-level configure.ac                         -*- Autoconf -*-
+dnl
 m4_include([sntp/m4/version.m4])
 AC_PREREQ([2.61])
-AC_INIT([ntp], [VERSION_NUMBER])
+AC_INIT(
+    [ntp],
+    [VERSION_NUMBER],
+    [http://bugs.ntp.org./],
+    [],
+    [http://www.ntp.org./]dnl
+)
 AC_CONFIG_MACRO_DIR([sntp/m4])
 AC_CONFIG_AUX_DIR([sntp/build-aux])
 
@@ -33,7 +39,8 @@ ntp_configure_cache_version=20110219
 
 NTP_CACHEVERSION([main], [$ntp_configure_cache_version])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.10 foreign -Wall -Wno-gnu])
+
 dnl AM_SILENT_RULES req. automake 1.11.  [yes] defaults V=0
 m4_ifdef(
     [AM_SILENT_RULES],

diff --git a/includes.mf b/includes.mf
new file mode 100644 (file)
index 0000000..e868ba4
--- /dev/null
+++ b/includes.mf
@@ -0,0 +1,6 @@
+## includes.mf - automake fragment
+
+NTP_INCS  = -I$(top_srcdir)/include
+NTP_INCS += -I$(top_srcdir)/lib/isc/include
+NTP_INCS += -I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include
+NTP_INCS += -I$(top_srcdir)/lib/isc/unix/include

diff --git a/kernel/Makefile.am b/kernel/Makefile.am
index c9cf385a7e7a30f384ca3dc10fe9c7bb903b5357..b89793c8618c7654efe832ace3a0c29828556864 100644 (file)
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.am
@@ -1,4 +1,2 @@
-AUTOMAKE_OPTIONS = 
 SUBDIRS = sys
-ETAGS_ARGS = Makefile.am
 EXTRA_DIST = chuinit.c clkinit.c tty_chu.c tty_chu_STREAMS.c tty_clk.c tty_clk_STREAMS.c

diff --git a/kernel/sys/Makefile.am b/kernel/sys/Makefile.am
index 0fce1f71e3c640c6b40d4c5955d10f4feea569ed..9e92dc8ef9f7426a8bce375be39c220aad534c3b 100644 (file)
--- a/kernel/sys/Makefile.am
+++ b/kernel/sys/Makefile.am
@@ -1,7 +1,2 @@
-AUTOMAKE_OPTIONS = 
 noinst_HEADERS = bsd_audioirig.h chudefs.h clkdefs.h i8253.h parsestreams.h \
  pcl720.h ppsclock.h timex.h tpro.h tt560_api.h
-#EXTRA_DIST= TAGS
-# HMS: Avoid bug in automake 
-#ETAGS_ARGS = ""
-ETAGS_ARGS = Makefile.am

diff --git a/libntp/Makefile.am b/libntp/Makefile.am
index 05062a27cbb25a327950305673154a61ce16e1ff..f3434cbb3f29188a1c6bad65734d049a90a04e1a 100644 (file)
--- a/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@ -1,5 +1,4 @@
 NULL=
-AUTOMAKE_OPTIONS = 
 BUILT_SOURCES =
 CLEANFILES =
 noinst_LIBRARIES = libntp.a @MAKE_LIBNTPSIM@
@@ -8,7 +7,7 @@ EXTRA_LIBRARIES = libntpsim.a
 libisc_SRCS =                                                          \
        $(srcdir)/../lib/isc/assertions.c                               \
        $(srcdir)/../lib/isc/buffer.c                                   \
-       $(srcdir)/../lib/isc/@LIBISC_PTHREADS_NOTHREADS@/condition.c    \
+       $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c   \
        $(srcdir)/../lib/isc/unix/dir.c                                 \
        $(srcdir)/../lib/isc/error.c                                    \
        $(srcdir)/../lib/isc/unix/errno2result.c                        \
@@ -31,7 +30,7 @@ libisc_SRCS =                                                         \
        $(srcdir)/../lib/isc/unix/stdtime.c                             \
        $(srcdir)/../lib/isc/unix/strerror.c                            \
        $(srcdir)/../lib/isc/task.c                                     \
-       $(srcdir)/../lib/isc/@LIBISC_PTHREADS_NOTHREADS@/thread.c       \
+       $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c      \
        $(srcdir)/../lib/isc/unix/time.c                                \
        $(srcdir)/../lib/isc/sockaddr.c                                 \
        $(NULL)
@@ -119,17 +118,14 @@ libntp_a_SRCS =                                           \
 libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
 libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
 EXTRA_libntp_a_SOURCES = adjtimex.c
-ETAGS_ARGS = Makefile.am
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES +=  $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 EXTRA_DIST = README
 
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index d61dba81301cb4887a00a91b3db02a7da8e65a0f..1df4208ff9a9b02439743c322a77c1c547d32bf7 100644 (file)
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -1,5 +1,4 @@
 NULL=
-AUTOMAKE_OPTIONS =
 BUILT_SOURCES = check-libntp
 noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
 EXTRA_LIBRARIES = libparse.a libparse_kernel.a
@@ -56,16 +55,11 @@ libparse_kernel_a_LIBADD =  \
        kgpstolfp.o             \
        $(NULL)
 
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += -I$(top_srcdir)/kernel
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
-
-ETAGS_ARGS = Makefile.am
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/kernel
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
 
@@ -146,3 +140,4 @@ sys/systm.h:
        sed -e '/ffs(.*)/d' < /usr/include/sys/systm.h > sys/systm.h
 
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index a7e6e74304ff9702b678468e7ebb76a3424b91d7..98cb29066ebea0f8c91941de3b65fb6fdcafa006 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -9,17 +9,14 @@ endif
 
 noinst_LIBRARIES=      libntpd.a
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES +=  $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB.
-LDADD = version.o libntpd.a @LIBPARSE@
+LDADD = version.o libntpd.a $(LIBPARSE)
 AM_YFLAGS = -d -t -r all
 
 if SAVECONFIG_ENABLED
@@ -289,3 +286,4 @@ version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/ntpd/refclock_true.c b/ntpd/refclock_true.c
index 61b70cc93b1a025225346faee526034a3b7a839d..c2c297c58b190975013fb88526306a5130f5ae9a 100644 (file)
--- a/ntpd/refclock_true.c
+++ b/ntpd/refclock_true.c
@@ -12,15 +12,15 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_TRUETIME)
 
+#include <stdio.h>
+#include <ctype.h>
+
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
 
-#include <stdio.h>
-#include <ctype.h>
-
 #ifdef SYS_WINNT
 extern int async_write(int, const void *, unsigned int);
 #undef write

diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index 18e732cec666ec06c4544d9703e3dbdfbe6c39ff..9c63c2c1585be8cbaa0910c71be8c495a498f748 100644 (file)
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -1,5 +1,4 @@
 NULL=
-AUTOMAKE_OPTIONS=
 
 BUILT_SOURCES= check-libntp
 CLEANFILES=
@@ -14,21 +13,17 @@ EXTRA_PROGRAMS=     ntptimeset
 
 ntptimeset_SOURCES=    ntptimeset.c ntptime_config.c
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
 LDADD = version.o ../libntp/libntp.a
-ntpdate_LDADD  = $(LDADD) @LDADD_LIBNTP@ @PTHREAD_LIBS@ $(LIBOPTS_LDADD)
-ntpdate_LDADD += $(LIBM) @LCRYPTO@
+ntpdate_LDADD  = $(LDADD) $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LIBOPTS_LDADD)
+ntpdate_LDADD += $(LIBM) $(LCRYPTO)
 DISTCLEANFILES=        .version version.c stamp-v
 noinst_HEADERS=        ntpdate.h
-ETAGS_ARGS=    Makefile.am
 
 $(PROGRAMS): $(LDADD)
 
@@ -49,3 +44,4 @@ version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/ver
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index f3ce90d57cb5c5e27a5fd89325f5ec1ff588de09..63e2faadad3941d630014df746551c346cc5c734 100644 (file)
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -419,18 +419,7 @@ ntpdatemain (
                        } else {
                                sys_timeout = ((LFPTOFP(&tmp) * TIMER_HZ)
                                           + 0x8000) >> 16;
-                               /*
-                                * No less than 1s between requests to
-                                * a server to stay within ntpd's
-                                * default "discard minimum 1" (and 1s
-                                * enforcement slop).  That is enforced
-                                * only if the nondefault limited
-                                * restriction is in place, such as with
-                                * "restrict ... limited" and "restrict
-                                * ... kod limited".
-                                */
-                               if (MINTIMEOUT < sys_timeout)
-                                       sys_timeout = MINTIMEOUT;
+                               sys_timeout = max(sys_timeout, MINTIMEOUT);
                        }
                        break;
                case 'v':

diff --git a/ntpdate/ntpdate.h b/ntpdate/ntpdate.h
index 75fba42910656ed693be3aabbeb131fb4a882a63..df9c49eb4a22e8518a8dbe0e66328b603e2f8aec 100644 (file)
--- a/ntpdate/ntpdate.h
+++ b/ntpdate/ntpdate.h
@@ -89,10 +89,13 @@ struct server {
 
 
 /*
- * Some defaults
+ * No less than 2s between requests to a server to stay within ntpd's
+ * default "discard minimum 1" (and 1s enforcement slop).  That is
+ * enforced only if the nondefault limited restriction is in place, such
+ * as with "restrict ... limited" and "restrict ... kod limited".
  */
-#define        MINTIMEOUT      (2 * TIMER_HZ)  /* 2s min. between packets */
-#define        DEFTIMEOUT      MINTIMEOUT      /*   (to the same server) */
+#define        MINTIMEOUT      (1 * TIMER_HZ)  /* 1s min. between packets */
+#define        DEFTIMEOUT      (2 * TIMER_HZ)  /* 2s by default */
 #define        DEFSAMPLES      4               /* get 4 samples per server */
 #define        DEFPRECISION    (-5)            /* the precision we claim */
 #define        DEFMAXPERIOD    60              /* maximum time to wait */

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index ebee410ea58ff790237099556cb3242ab5aaec84..aba33a418aea5a9d5657e3247e03267e152c7c6f 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -1,5 +1,4 @@
 NULL=
-AUTOMAKE_OPTIONS=
 
 if NTP_BINSUBDIR_IS_BIN
 bin_PROGRAMS=  ntpdc
@@ -11,18 +10,16 @@ EXTRA_PROGRAMS=     ntpdc-layout
 EXTRA_DATA=    check-layout
 BUILT_SOURCES= check-libntp @MAKE_CHECK_LAYOUT@ ntpdc-opts.c ntpdc-opts.h
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES +=  $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
-ntpdc_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a @LDADD_LIBNTP@
-ntpdc_LDADD += @PTHREAD_LIBS@ @EDITLINE_LIBS@ @LCRYPTO@
+ntpdc_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
+ntpdc_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(EDITLINE_LIBS)
+ntpdc_LDADD += $(LCRYPTO)
 # ntpdc-layout doesn't need any additional libraries at all
 ntpdc_layout_LDADD=
 
@@ -94,3 +91,4 @@ nl.c: nl_in.c nl.pl Makefile.am ../config.h ../include/ntp_request.h ntpdc.h
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 6812a42d85b6134db16d6d3e7db834b500de8188..44d81f23d9572b9b8d1367e537ebc4337733696c 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -1,5 +1,4 @@
 NULL=
-AUTOMAKE_OPTIONS=      
 
 if NTP_BINSUBDIR_IS_BIN
 bin_PROGRAMS=  ntpq
@@ -7,18 +6,16 @@ else
 sbin_PROGRAMS= ntpq
 endif
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
-ntpq_LDADD  = version.o $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a @LDADD_LIBNTP@
-ntpq_LDADD += @PTHREAD_LIBS@ @EDITLINE_LIBS@ @LCRYPTO@
+ntpq_LDADD  = version.o $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a
+ntpq_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(EDITLINE_LIBS)
+ntpq_LDADD += $(LCRYPTO)
 noinst_HEADERS=        ntpq.h
 noinst_LIBRARIES=      libntpq.a
 libntpq_a_CFLAGS=      -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
@@ -77,3 +74,4 @@ version.o: $(ntpq_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/versio
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index 4a978b447a8459288b46aee81a8161774d91b2a4..de7bc14c8edfd6e6c26ca778ee7b3418f519ca9e 100644 (file)
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -1,5 +1,4 @@
 NULL=
-AUTOMAKE_OPTIONS= 
 
 if NTP_BINSUBDIR_IS_BIN
 bin_PROGRAMS=  @MAKE_NTPSNMPD@
@@ -12,19 +11,17 @@ ntpsnmpd_SOURCES= netsnmp_daemonize.c ntpsnmpd.c ntpSnmpSubagentObject.c \
                ntpsnmpd-opts.c ntpsnmpd-opts.h ntpSnmpSubagentObject.h \
                ntp_snmp.h
 # HMS: we probably want a version.o file here, too.
-LDADD  = ../ntpq/libntpq.a ../libntp/libntp.a @LDADD_LIBNTP@ @PTHREAD_LIBS@ @LCRYPTO@
-LDADD += @SNMP_LIBS@ $(LIBOPTS_LDADD)
+LDADD  = ../ntpq/libntpq.a ../libntp/libntp.a $(LDADD_LIBNTP)
+LDADD += $(PTHREAD_LIBS) $(LCRYPTO) $(SNMP_LIBS) $(LIBOPTS_LDADD)
 
-INCLUDES  = -I$(top_srcdir)/ntpq
-INCLUDES += -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
-INCLUDES += @SNMP_CPPFLAGS@
+AM_CFLAGS = $(SNMP_CFLAGS) $(CFLAGS_NTP)
+
+AM_CPPFLAGS  = -I$(top_srcdir)/ntpq
+AM_CPPFLAGS += $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(SNMP_CPPFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
-AM_CFLAGS =    @SNMP_CFLAGS@ @CFLAGS_NTP@
-AM_CPPFLAGS =  @CPPFLAGS_NTP@
 EXTRA_DIST=    ntpsnmpd-opts.def ntpsnmpd.1 ntpsnmpd-opts.texi \
                ntpsnmpd-opts.menu ntpv4-mib.mib
 BUILT_SOURCES= check-libntp ntpsnmpd-opts.c ntpsnmpd-opts.h
@@ -67,3 +64,4 @@ FRC:
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/parseutil/Makefile.am b/parseutil/Makefile.am
index d428146e4ebb266efc6b9183dbf1637afe4f355b..421fbba651905cf0dc07702f75246684fb95023c 100644 (file)
--- a/parseutil/Makefile.am
+++ b/parseutil/Makefile.am
@@ -1,19 +1,16 @@
 NULL=
 
-AUTOMAKE_OPTIONS = 
 BUILT_SOURCES =
 CLEANFILES =
 noinst_PROGRAMS = @TESTDCF@ @DCFD@
 EXTRA_PROGRAMS = testdcf dcfd
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
-LDADD = @LDADD_LIBNTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
+
+LDADD = $(LDADD_LIBNTP)
 
 ETAGS_ARGS = Makefile.am
 DISTCLEANFILES = $(EXTRA_PROGRAMS)
@@ -24,3 +21,4 @@ check-local: @DCFD@
        esac
 
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 4f5c4005f95dc1156bbb08133cb31984f06fdb8a..14f974b613d4e42182fc5ab8d14c0cdc9c9f78bc 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -1,27 +1,24 @@
 ## Makefile.am for JMK's SNTP, by Harlan Stenn
 
-NULL =
+ACLOCAL_AMFLAGS = -I m4 -I libevent/m4 -I libopts/m4
 
-## LIBOPTS_CHECK_NOBUILD works with Automake 1.10 now
-AUTOMAKE_OPTIONS = foreign 1.10
-ACLOCAL_AMFLAGS = -I m4 -I libopts/m4 -I libevent/m4
+NULL =
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_LIBEVENT@ @CPPFLAGS_NTP@
+AM_CFLAGS = $(CFLAGS_NTP)
 
-INCLUDES  = -I$(top_srcdir)/../include
-INCLUDES += -I$(top_srcdir)/../lib/isc/include
-INCLUDES += -I$(top_srcdir)/../lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/../lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS  = $(SNTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 LDADD  = version.o
 LDADD += $(LIBOPTS_LDADD)
-LDADD += @LDADD_LIBEVENT@
+LDADD += $(LDADD_LIBEVENT)
 LDADD += $(LIBM)
-LDADD += ../libntp/libntp.a @LDADD_LIBNTP@
-LDADD += @PTHREAD_LIBS@
-LDADD += @LCRYPTO@
+LDADD += ../libntp/libntp.a
+LDADD += $(LDADD_LIBNTP)
+LDADD += $(PTHREAD_LIBS)
+LDADD += $(LCRYPTO)
 
 run_ag =       cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
                autogen -L include --writable
@@ -240,10 +237,11 @@ libtool: $(LIBTOOL_DEPS)
        ./config.status --recheck
 
 libevent-dist-hook:
-       if test -n "@NTP_FORCE_LIBEVENT_DIST@" ; then rm -rf $(distdir)/libevent/autom4te.cache $(distdir)/libevent/config.h.in~ ; find $(distdir)/libevent -type d -name SCCS -print | xargs rm -rf ; fi
+       if test -n "$(NTP_FORCE_LIBEVENT_DIST)" ; then rm -rf $(distdir)/libevent/autom4te.cache $(distdir)/libevent/config.h.in~ ; find $(distdir)/libevent -type d -name SCCS -print | xargs rm -rf ; fi
 
 dist-hook: libevent-dist-hook
        @: do-nothing action to avoid default SCCS get
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 12c4c87985397d6e89cfc6267a57b5294a0002cf..fcf356a2a4dfc3ecba093e9193129afa98c3d6dd 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -1,8 +1,14 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
+dnl SNTP subpackage configure.ac                       -*- Autoconf -*-
+dnl
 m4_include([m4/version.m4])
 AC_PREREQ([2.61])
-AC_INIT([sntp], [VERSION_NUMBER])
+AC_INIT(
+    [sntp],
+    [VERSION_NUMBER],
+    [http://bugs.ntp.org./],
+    [],
+    [http://www.ntp.org./]dnl
+)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -33,7 +39,7 @@ sntp_configure_cache_version=20110219
 
 NTP_CACHEVERSION([sntp], [$sntp_configure_cache_version])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.10 foreign -Wall -Wno-gnu])
 dnl AM_SILENT_RULES req. automake 1.11.  [yes] defaults V=0
 m4_ifdef(
     [AM_SILENT_RULES],

diff --git a/sntp/includes.mf b/sntp/includes.mf
new file mode 100644 (file)
index 0000000..9ba126d
--- /dev/null
+++ b/sntp/includes.mf
@@ -0,0 +1,6 @@
+## includes.mf - automake fragment
+
+SNTP_INCS  = -I$(top_srcdir)/../include
+SNTP_INCS += -I$(top_srcdir)/../lib/isc/include
+SNTP_INCS += -I$(top_srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include
+SNTP_INCS += -I$(top_srcdir)/../lib/isc/unix/include

diff --git a/sntp/m4/ntp_libevent.m4 b/sntp/m4/ntp_libevent.m4
index 35bc047e67cb754908d8928f47def509c6bae448..6f914224a89ac980242994e2e63b34893536a143 100644 (file)
--- a/sntp/m4/ntp_libevent.m4
+++ b/sntp/m4/ntp_libevent.m4
@@ -113,9 +113,9 @@ esac
 case "$ntp_use_local_libevent" in
  yes)
     dnl ac_configure_args is undocumented but widely abused.
-    ac_configure_args="--disable-shared $ac_configure_args"
-    ac_configure_args="--disable-libevent-regress $ac_configure_args"
-    ac_configure_args="--disable-libevent-install $ac_configure_args"
+    ac_configure_args=" --disable-shared${ac_configure_args}"
+    ac_configure_args=" --disable-libevent-regress${ac_configure_args}"
+    ac_configure_args=" --disable-libevent-install${ac_configure_args}"
     AC_CONFIG_SUBDIRS([libevent])
     ;;
  *)

diff --git a/sntp/m4/ntp_libntp.m4 b/sntp/m4/ntp_libntp.m4
index b39b417929414fc9147deb31880d853c22d182a2..0ea398b1044c1559e7ba53176bc081901bc73822 100644 (file)
--- a/sntp/m4/ntp_libntp.m4
+++ b/sntp/m4/ntp_libntp.m4
@@ -295,29 +295,44 @@ AC_FUNC_STRERROR_R
 
 # check if we can compile with pthreads
 AC_CHECK_HEADERS([semaphore.h])
-AC_CHECK_FUNCS([sem_timedwait socketpair])
+AC_CHECK_FUNCS([socketpair])
 AC_ARG_ENABLE(
     [thread-support],
     [AS_HELP_STRING([--disable-thread-support, do not use threads])],
-    , 
+    [],
     [enable_thread_support=yes]
     )
 have_pthreads=no
-case "$enable_thread_support:$ac_cv_func_sem_timedwait" in
- yes:yes)
-    OL_THREAD_CHECK(
-       [
-           have_pthreads=yes
+case "$enable_thread_support" in
+ yes)
+    ol_found_pthreads=no
+    OL_THREAD_CHECK([ol_found_pthreads=yes])
+    case "$ol_found_pthreads" in
+     yes)
+       saved_LIBS="$LIBS"
+       LIBS="$LTHREAD_LIBS $LIBS"
+       saved_CFLAGS="$CFLAGS"
+       CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+       AC_CHECK_FUNCS([sem_timedwait])
+       LIBS="$saved_LIBS"
+       AS_UNSET([saved_LIBS])
+       CFLAGS="$saved_CFLAGS"
+       AS_UNSET([saved_CFLAGS])
+       case "$ac_cv_func_sem_timedwait" in
+        yes)
            PTHREAD_LIBS="$LTHREAD_LIBS"
-       ]
-    )
+           have_pthreads=yes
+       esac
+    esac
 esac
 AC_SUBST([PTHREAD_LIBS])
 case "$have_pthreads" in
  yes)
     CFLAGS_NTP="$CFLAGS_NTP $PTHREAD_CFLAGS"
+    saved_LIBS="$LIBS"
+    LIBS="$LTHREAD_LIBS $LIBS"
     saved_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+    CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
     AC_CHECK_SIZEOF(
        [pthread_t],
        ,
@@ -432,6 +447,8 @@ case "$have_pthreads" in
        AC_DEFINE([ISC_PLATFORM_BRACEPTHREADONCEINIT], [1],
                  [Enclose PTHREAD_ONCE_INIT in extra braces?])
     esac
+    LIBS="$saved_LIBS"
+    AS_UNSET([saved_LIBS])
     CFLAGS="$saved_CFLAGS"
     AS_UNSET([saved_CFLAGS])
     ;;

diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index 6b852d70f26ccd8a8e5880527faa08f0dc293bc2..ec0c874a1fb8ee845331678101b478d4976aa1ca 100644 (file)
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -1,4 +1,5 @@
 NULL =
+BUILT_SOURCES =
 
 check_PROGRAMS = 
 if BUILD_SNTP
@@ -56,26 +57,25 @@ CLEANFILES =                                \
 
 LDADD =                                                \
        $(LIBOPTS_LDADD)                        \
-       @LDADD_LIBEVENT@                        \
-       @top_builddir@/../libntp/libntp.a       \
-       @LDADD_LIBNTP@                          \
-       @LCRYPTO@                               \
-       @GTEST_LDFLAGS@                         \
-       @GTEST_LIBS@                            \
+       $(LDADD_LIBEVENT)                       \
+       $(top_builddir)/../libntp/libntp.a      \
+       $(LDADD_LIBNTP)                         \
+       $(LCRYPTO)                              \
+       $(GTEST_LDFLAGS)                        \
+       $(GTEST_LIBS)                           \
        $(sntp_SOURCES_USED)                    \
        $(NULL)
 
-AM_CFLAGS   = @CFLAGS_NTP@
-AM_CXXFLAGS = @GTEST_CXXFLAGS@
-AM_CPPFLAGS = @CPPFLAGS_LIBEVENT@ @GTEST_CPPFLAGS@ @CPPFLAGS_NTP@
+AM_CFLAGS   = $(CFLAGS_NTP)
+AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
-INCLUDES  = $(LIBOPTS_CFLAGS)
-INCLUDES += -I$(top_srcdir)/../include
-INCLUDES += -I$(top_srcdir)/../lib/isc/include
-INCLUDES += -I$(top_srcdir)/../lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/../lib/isc/unix/include
-INCLUDES += -I$(top_srcdir)/../tests
-INCLUDES += -I$(top_srcdir)
+AM_CPPFLAGS  = $(SNTP_INCS)
+AM_CPPFLAGS += -I$(srcdir)/..
+AM_CPPFLAGS += -I$(top_srcdir)/../tests
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT)
+AM_CPPFLAGS += $(GTEST_CPPFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 TESTS = 
 
@@ -87,3 +87,6 @@ TESTS_ENVIRONMENT = $(top_srcdir)/tests/test-driver $(TEST_INPUT_DIR) $(TEST_OUT
 if !NTP_CROSSCOMPILE
 TESTS += $(check_PROGRAMS)
 endif
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index 0a415ff123e9c21c7a62b7119951db57824d7efb..f5d8727fc782e244975e28698d0d05a90c751d32 100644 (file)
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -1,25 +1,25 @@
 NULL =
+BUILT_SOURCES =
+CLEANFILES =
 
 check_PROGRAMS = tests
 
 LDADD =                                        \
-       @top_builddir@/libntp/libntp.a  \
-       @LDADD_LIBNTP@                  \
-       @PTHREAD_LIBS@                  \
-       @LCRYPTO@                       \
-       @GTEST_LDFLAGS@                 \
-       @GTEST_LIBS@                    \
+       $(top_builddir)/libntp/libntp.a \
+       $(LDADD_LIBNTP)                 \
+       $(PTHREAD_LIBS)                 \
+       $(LCRYPTO)                      \
+       $(GTEST_LDFLAGS)                \
+       $(GTEST_LIBS)                   \
        $(NULL)
 
-AM_CFLAGS   = @CFLAGS_NTP@
-AM_CXXFLAGS = @GTEST_CXXFLAGS@
-AM_CPPFLAGS = @GTEST_CPPFLAGS@ @CPPFLAGS_NTP@
+AM_CFLAGS   = $(CFLAGS_NTP)
+AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += -I$(top_srcdir)/sntp
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/sntp
+AM_CPPFLAGS += $(GTEST_CPPFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp      \
                libntptest.cpp          \
@@ -75,3 +75,6 @@ TESTS =
 if !NTP_CROSSCOMPILE
 TESTS += tests
 endif
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf

diff --git a/util/Makefile.am b/util/Makefile.am
index a585ec2b7678fe2398a4f6cf7e79c2e212c8850e..2fc2b4efb9af108ad932f8abf66895bbfdf8fca9 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,5 +1,4 @@
 NULL=
-AUTOMAKE_OPTIONS=
 
 if NTP_BINSUBDIR_IS_BIN
 bin_PROGRAMS=  @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ \
@@ -12,24 +11,19 @@ endif
 EXTRA_PROGRAMS=        audio-pcm byteorder hist jitter kern longsize \
        ntptime pps-api precision sht testrs6000 tg tg2 tickadj timetrim
 
-INCLUDES  = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
 
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
-LDADD=         ../libntp/libntp.a @LDADD_LIBNTP@ @PTHREAD_LIBS@
+LDADD=         ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
 tg2_LDADD=     $(LIBM)
-ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a @LDADD_LIBNTP@
-ntp_keygen_LDADD += @PTHREAD_LIBS@ @LCRYPTO@
+ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
+ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LCRYPTO)
 ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
 
-ETAGS_ARGS=    Makefile.am
-#EXTRA_DIST=   README TAGS
 EXTRA_DIST=    ntp-keygen-opts.def ntp-keygen.1 ntp-keygen-opts.texi ntp-keygen-opts.menu
 BUILT_SOURCES= check-libntp ntp-keygen-opts.c ntp-keygen-opts.h
 CLEANFILES=
@@ -87,3 +81,4 @@ version.o: $(ntp_keygen_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf