Update the std_def_list to include the ntp.lic file.

bk: 4de72cf0oFisTBUuDMzMXilN2NcL2Q

diff --git a/ChangeLog b/ChangeLog
index dccb05b446d886efb5d4147e4e57c314a4c14c1c..043439d389dd65041220122a2d402025e5180293 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Update the std_def_list to include the ntp.lic file.
 * Distribute the ntp.lic file.
 * Add http://ntp.org/license to the ntp.lic file.
 (4.2.7p177) 2011/06/01 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 4ce126c819bd32e1a2dc3623476919bc26379563..f6281eaeefb5a3b98ae47e9eaf6dadb6b5e1d211 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -131,6 +131,7 @@ std_def_list =                                                      \
        $(top_srcdir)/sntp/include/autogen-version.def          \
        $(top_srcdir)/sntp/include/copyright.def                \
        $(top_srcdir)/sntp/include/homerc.def                   \
+       $(top_srcdir)/sntp/include/ntp.lic                      \
        $(top_srcdir)/sntp/include/version.def                  \
        $(NULL)
 

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 86b5f9badd9e116333772006349d87a502838c29..d7c7074cc887a8687269466bd81027f6aaf8147d 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -58,6 +58,7 @@ std_def_list =                                                        \
        $(top_srcdir)/sntp/include/autogen-version.def          \
        $(top_srcdir)/sntp/include/copyright.def                \
        $(top_srcdir)/sntp/include/homerc.def                   \
+       $(top_srcdir)/sntp/include/ntp.lic                      \
        $(top_srcdir)/sntp/include/version.def                  \
        $(NULL)
 

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index e90fc2e3b7cd3870e2177fe1f0fcef1dd8ccba08..c365ca0cf6ac662811e029fb10da8d866fea4355 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -33,6 +33,7 @@ std_def_list =                                                        \
        $(top_srcdir)/sntp/include/autogen-version.def          \
        $(top_srcdir)/sntp/include/copyright.def                \
        $(top_srcdir)/sntp/include/homerc.def                   \
+       $(top_srcdir)/sntp/include/ntp.lic                      \
        $(top_srcdir)/sntp/include/version.def                  \
        $(NULL)
 ntpq_SOURCES=  ntpq.c ntpq-subs.c ntpq-opts.c ntpq-opts.h

diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index ecfec3d9a5547d9739514eb7418cffe04ab0d984..0096810b3c141b8aef30ab82bb50ec5a6d58f5e6 100644 (file)
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -35,6 +35,7 @@ std_def_list =                                                        \
        $(top_srcdir)/sntp/include/autogen-version.def          \
        $(top_srcdir)/sntp/include/copyright.def                \
        $(top_srcdir)/sntp/include/homerc.def                   \
+       $(top_srcdir)/sntp/include/ntp.lic                      \
        $(top_srcdir)/sntp/include/version.def                  \
        $(NULL)
 

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 9bed717f51e87abd19a4c8bf14b0867ced37c635..dc87bc2e3cfdc6ec1d179106700f63e85384b16f 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -22,6 +22,14 @@ LDADD += $(LCRYPTO)
 
 run_ag =       cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
                autogen -L include -L ag-tpl --writable
+std_def_list =                                         \
+       $(srcdir)/include/debug-opt.def                 \
+       $(srcdir)/include/autogen-version.def           \
+       $(srcdir)/include/copyright.def                 \
+       $(srcdir)/include/homerc.def                    \
+       $(srcdir)/include/ntp.lic                       \
+       $(srcdir)/include/version.def                   \
+       $(NULL)
 
 EXTRA_PROGRAMS = sntp
 
@@ -215,18 +223,18 @@ $(srcdir)/COPYRIGHT: check-COPYRIGHT
 $(srcdir)/sntp-opts.h: $(srcdir)/sntp-opts.c
        @: do-nothing action to avoid default SCCS get, .h built with .c
 
-$(srcdir)/sntp-opts.c: $(srcdir)/sntp-opts.def $(srcdir)/include/version.def $(srcdir)/include/copyright.def
+$(srcdir)/sntp-opts.c: $(srcdir)/sntp-opts.def $(std_def_list)
        $(run_ag) sntp-opts.def
 
 # For man pages, use agman-cmd.tpl
 # For mdoc pages, use agmdoc-cmd.tpl
-$(srcdir)/sntp.1: $(srcdir)/sntp-opts.def $(srcdir)/include/version.def $(srcdir)/include/copyright.def
+$(srcdir)/sntp.1: $(srcdir)/sntp-opts.def $(std_def_list)
        $(run_ag) -DMAN_SECTION=1 -Tagmdoc-cmd.tpl sntp-opts.def
 
 $(srcdir)/sntp-opts.menu: $(srcdir)/sntp-opts.texi
        @: do-nothing action to avoid default SCCS get, .menu built with .texi
 
-$(srcdir)/sntp-opts.texi: $(srcdir)/sntp-opts.def $(srcdir)/include/version.def $(srcdir)/include/copyright.def
+$(srcdir)/sntp-opts.texi: $(srcdir)/sntp-opts.def $(std_def_list)
        $(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
        $(top_srcdir)/../scripts/check--help $@
 

diff --git a/util/Makefile.am b/util/Makefile.am
index 67b4abce481685cbe0fe675cd92ec960b1731766..b8bfc0234f16dc3a3aa5d42c02d8f3118da287a0 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -37,6 +37,7 @@ std_def_list =                                                        \
        $(top_srcdir)/sntp/include/autogen-version.def          \
        $(top_srcdir)/sntp/include/copyright.def                \
        $(top_srcdir)/sntp/include/homerc.def                   \
+       $(top_srcdir)/sntp/include/ntp.lic                      \
        $(top_srcdir)/sntp/include/version.def                  \
        $(NULL)