From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 2 Jun 2011 06:25:52 +0000 (-0400)
Subject: Update the std_def_list to include the ntp.lic file.
X-Git-Tag: NTP_4_2_7P178~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86195b822451c885222fb4f0d351064dadfc995b;p=thirdparty%2Fntp.git

Update the std_def_list to include the ntp.lic file.

bk: 4de72cf0oFisTBUuDMzMXilN2NcL2Q
---

diff --git a/ChangeLog b/ChangeLog
index dccb05b44..043439d38 100644
--- 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 4ce126c81..f6281eaee 100644
--- 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 86b5f9bad..d7c7074cc 100644
--- 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 e90fc2e3b..c365ca0cf 100644
--- 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 ecfec3d9a..0096810b3 100644
--- 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 9bed717f5..dc87bc2e3 100644
--- 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 67b4abce4..b8bfc0234 100644
--- 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)