From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 19 Dec 2013 07:56:15 +0000 (+0000)
Subject: automake cleanup for Oliver's work
X-Git-Tag: NTP_4_2_7P402~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26a9869a0fc8c4d43a712aa150cc297af92eafac;p=thirdparty%2Fntp.git

automake cleanup for Oliver's work

bk: 52b2a69fc94p8youIiMwSI6KW0Af5g
---

diff --git a/configure.ac b/configure.ac
index 033dd5cdd..8fc3bb08f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3684,6 +3684,10 @@ case "$ntp_cv_make_tickadj" in
     MAKE_TICKADJ=tickadj
     ;;
  *)
+    CALC_TICKADJ_DB=
+    CALC_TICKADJ_DL=
+    CALC_TICKADJ_DS=
+    CALC_TICKADJ_MS=
     TICKADJ_DB=
     TICKADJ_DL=
     TICKADJ_DS=
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3834f0678..cf4194276 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,12 @@
-SUBDIRS = build calc_tickadj ntp-wait ntpsweep ntptrace lib
-
 NULL=
+SUBDIRS=		\
+	build		\
+	calc_tickadj	\
+	ntp-wait	\
+	ntpsweep	\
+	ntptrace	\
+	lib		\
+	$(NULL)
 
 man1_MANS=
 man8_MANS=
diff --git a/scripts/calc_tickadj/Makefile.am b/scripts/calc_tickadj/Makefile.am
index fbdea5741..e5cf75060 100644
--- a/scripts/calc_tickadj/Makefile.am
+++ b/scripts/calc_tickadj/Makefile.am
@@ -2,21 +2,22 @@ run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
 		--writable
 
+bin_SCRIPTS=	$(CALC_TICKADJ_DB)
+libexec_SCRIPTS=	$(CALC_TICKADJ_DL)
+sbin_SCRIPTS=	$(CALC_TICKADJ_DS)
+EXTRA_SCRIPTS=	calc_tickadj
+
 EXTRA_DIST = 	\
 	$(srcdir)/calc_tickadj.in \
-	$(srcdir)/calc_tickadj 	\
 	$(srcdir)/calc_tickadj.1calc_tickadjman	\
 	$(srcdir)/calc_tickadj.1calc_tickadjmdoc	\
 	$(srcdir)/calc_tickadj.texi	\
 	$(srcdir)/calc_tickadj.html	\
-	$(srcdir)/calc_tickadj.1		\
 	$(srcdir)/calc_tickadj-opts.def	\
 	$(srcdir)/calc_tickadj-opts	\
 	$(srcdir)/invoke-calc_tickadj.texi	\
 	$(srcdir)/invoke-calc_tickadj.menu
 
-noinst_SCRIPTS = calc_tickadj
-
 noinst_DATA = \
 	$(srcdir)/calc_tickadj.in \
 	$(srcdir)/calc_tickadj.1calc_tickadjman	\
@@ -60,9 +61,9 @@ $(srcdir)/calc_tickadj.mdoc.in: $(srcdir)/calc_tickadj.1calc_tickadjmdoc $(top_s
 
 ### Manpage
 
-$(srcdir)/calc_tickadj.1: $(srcdir)/calc_tickadj.$(MANTAGFMT).in $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=calc_tickadj.1+:$(srcdir)/calc_tickadj.$(MANTAGFMT).in
-	mv calc_tickadj.1+ calc_tickadj.1
+calc_tickadj.$(CALC_TICKADJ_MS): $(srcdir)/calc_tickadj.$(MANTAGFMT).in $(top_builddir)/config.status
+	$(top_builddir)/config.status --file=calc_tickadj.$(CALC_TICKADJ_MS)+:$(srcdir)/calc_tickadj.$(MANTAGFMT).in
+	mv calc_tickadj.$(CALC_TICKADJ_MS)+ calc_tickadj.$(CALC_TICKADJ_MS)
 
 ### Texinfo
 
diff --git a/scripts/calc_tickadj/calc_tickadj.texi b/scripts/calc_tickadj/calc_tickadj.texi
index a12a626c6..d15b428ec 100644
--- a/scripts/calc_tickadj/calc_tickadj.texi
+++ b/scripts/calc_tickadj/calc_tickadj.texi
@@ -2,7 +2,7 @@
 @c %**start of header
 @setfilename calc_tickadj.info
 @settitle calc_tickadj User's Manual
-@include ../..//sntp/include/version.texi
+@include ../../sntp/include/version.texi
 @paragraphindent 2
 @c %**end of header
 
diff --git a/scripts/calc_tickadj/invoke-calc_tickadj.texi b/scripts/calc_tickadj/invoke-calc_tickadj.texi
index 39c42397c..99d51bb99 100644
--- a/scripts/calc_tickadj/invoke-calc_tickadj.texi
+++ b/scripts/calc_tickadj/invoke-calc_tickadj.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-calc_tickadj.texi)
 #
-# It has been AutoGen-ed  December 17, 2013 at 09:24:47 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  December 19, 2013 at 07:48:41 AM by AutoGen 5.18.3pre7
 # From the definitions    calc_tickadj-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntp-wait/Makefile.am b/scripts/ntp-wait/Makefile.am
index b8f48aefa..07c3c059c 100644
--- a/scripts/ntp-wait/Makefile.am
+++ b/scripts/ntp-wait/Makefile.am
@@ -1,41 +1,42 @@
-man_MANS=	ntp-wait.$(NTP_WAIT_MS)
+NULL=
 
 bin_SCRIPTS =	$(NTP_WAIT_DB)
 libexec_SCRIPTS =	$(NTP_WAIT_DL)
 sbin_SCRIPTS =	$(NTP_WAIT_DS)
 
-run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
+man_MANS=	ntp-wait.$(NTP_WAIT_MS)
+
+run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)" PERL5LIB="$(abs_top_srcdir)/scripts/lib"	\
 		autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
 		--writable
 
 EXTRA_SCRIPTS = ntp-wait
 
-EXTRA_DIST = 	\
-	$(srcdir)/ntp-wait.in \
-	$(srcdir)/ntp-wait 	\
-	$(srcdir)/ntp-wait.1ntp-waitman	\
+EXTRA_DIST =					\
+	$(srcdir)/ntp-wait.in			\
+	$(srcdir)/ntp-wait.1ntp-waitman		\
 	$(srcdir)/ntp-wait.1ntp-waitmdoc	\
-	$(srcdir)/ntp-wait.texi	\
-	$(srcdir)/ntp-wait.html	\
-	$(srcdir)/ntp-wait.1		\
-	$(srcdir)/ntp-wait-opts.def	\
-	$(srcdir)/ntp-wait-opts	\
-	$(srcdir)/invoke-ntp-wait.texi	\
-	$(srcdir)/invoke-ntp-wait.menu
+	$(srcdir)/ntp-wait.texi			\
+	$(srcdir)/ntp-wait.html			\
+	$(srcdir)/ntp-wait-opts.def		\
+	$(srcdir)/ntp-wait-opts			\
+	$(srcdir)/invoke-ntp-wait.texi		\
+	$(srcdir)/invoke-ntp-wait.menu		\
+	$(NULL)
 
 html_DATA = $(srcdir)/ntp-wait.html
 
-noinst_DATA = \
-	$(srcdir)/ntp-wait.in \
-	$(srcdir)/ntp-wait.1ntp-waitman	\
+noinst_DATA =					\
+	$(srcdir)/ntp-wait.in 			\
+	$(srcdir)/ntp-wait.1ntp-waitman		\
 	$(srcdir)/ntp-wait.1ntp-waitmdoc	\
-	$(srcdir)/ntp-wait.texi	\
-	$(srcdir)/ntp-wait.html	\
-	$(srcdir)/ntp-wait.1		\
-	$(srcdir)/ntp-wait-opts.def	\
-	$(srcdir)/ntp-wait-opts	\
-	$(srcdir)/invoke-ntp-wait.texi	\
-	$(srcdir)/invoke-ntp-wait.menu
+	$(srcdir)/ntp-wait.texi			\
+	$(srcdir)/ntp-wait.html			\
+	$(srcdir)/ntp-wait-opts.def		\
+	$(srcdir)/ntp-wait-opts			\
+	$(srcdir)/invoke-ntp-wait.texi		\
+	$(srcdir)/invoke-ntp-wait.menu		\
+	$(NULL)
 
 ntp-wait: $(srcdir)/ntp-wait-opts
 
@@ -68,9 +69,9 @@ $(srcdir)/ntp-wait.mdoc.in: $(srcdir)/ntp-wait.1ntp-waitmdoc $(top_srcdir)/sntp/
 
 ### Manpage
 
-$(srcdir)/ntp-wait.1: $(srcdir)/ntp-wait.$(MANTAGFMT).in $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=ntp-wait.1+:$(srcdir)/ntp-wait.$(MANTAGFMT).in
-	mv ntp-wait.1+ ntp-wait.1
+ntp-wait.$(NTP_WAIT_MS): $(srcdir)/ntp-wait.$(MANTAGFMT).in $(top_builddir)/config.status
+	$(top_builddir)/config.status --file=ntp-wait.$(NTP_WAIT_MS)+:$(srcdir)/ntp-wait.$(MANTAGFMT).in
+	mv ntp-wait.$(NTP_WAIT_MS)+ ntp-wait.$(NTP_WAIT_MS)
 
 ### Texinfo
 
diff --git a/scripts/ntp-wait/invoke-ntp-wait.texi b/scripts/ntp-wait/invoke-ntp-wait.texi
index 0ea4ac5e1..f5c8f42b3 100644
--- a/scripts/ntp-wait/invoke-ntp-wait.texi
+++ b/scripts/ntp-wait/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 #
-# It has been AutoGen-ed  December 18, 2013 at 10:49:43 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  December 19, 2013 at 07:48:46 AM by AutoGen 5.18.3pre7
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntp-wait/ntp-wait.in b/scripts/ntp-wait/ntp-wait.in
index a7a40acb9..b35828a16 100644
--- a/scripts/ntp-wait/ntp-wait.in
+++ b/scripts/ntp-wait/ntp-wait.in
@@ -5,7 +5,6 @@ use 5.006_000;
 use strict;
 use warnings;
 use lib "@PERLLIBDIR@";
-use lib "@abs_top_srcdir@/scripts/lib";
 use NTP::Util qw(ntp_read_vars);
 
 exit run(@ARGV) unless caller;
diff --git a/scripts/ntpsweep/Makefile.am b/scripts/ntpsweep/Makefile.am
index caaa3276d..32837e261 100644
--- a/scripts/ntpsweep/Makefile.am
+++ b/scripts/ntpsweep/Makefile.am
@@ -1,34 +1,35 @@
-run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
+NULL=
+run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)" PERL5LIB="$(abs_top_srcdir)/scripts/lib"	\
 		autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
 		--writable
 
 noinst_SCRIPTS = ntpsweep
 
-EXTRA_DIST = 	\
-	$(srcdir)/ntpsweep.in \
-	$(srcdir)/ntpsweep.1ntpsweepman	\
+EXTRA_DIST =					\
+	$(srcdir)/ntpsweep.in			\
+	$(srcdir)/ntpsweep.1ntpsweepman		\
 	$(srcdir)/ntpsweep.1ntpsweepmdoc	\
-	$(srcdir)/ntpsweep.texi	\
-	$(srcdir)/ntpsweep.html	\
-	$(srcdir)/ntpsweep.1		\
-	$(srcdir)/ntpsweep-opts.def	\
-	$(srcdir)/ntpsweep-opts	\
-	$(srcdir)/invoke-ntpsweep.texi	\
-	$(srcdir)/invoke-ntpsweep.menu
+	$(srcdir)/ntpsweep.texi			\
+	$(srcdir)/ntpsweep.html			\
+	$(srcdir)/ntpsweep-opts.def		\
+	$(srcdir)/ntpsweep-opts			\
+	$(srcdir)/invoke-ntpsweep.texi		\
+	$(srcdir)/invoke-ntpsweep.menu		\
+	$(NULL)
 
 html_DATA = $(srcdir)/ntpsweep.html
 
-noinst_DATA = \
-	$(srcdir)/ntpsweep.in \
-	$(srcdir)/ntpsweep.1ntpsweepman	\
+noinst_DATA =					\
+	$(srcdir)/ntpsweep.in			\
+	$(srcdir)/ntpsweep.1ntpsweepman		\
 	$(srcdir)/ntpsweep.1ntpsweepmdoc	\
-	$(srcdir)/ntpsweep.texi	\
-	$(srcdir)/ntpsweep.html	\
-	$(srcdir)/ntpsweep.1		\
-	$(srcdir)/ntpsweep-opts.def	\
-	$(srcdir)/ntpsweep-opts	\
-	$(srcdir)/invoke-ntpsweep.texi	\
-	$(srcdir)/invoke-ntpsweep.menu
+	$(srcdir)/ntpsweep.texi			\
+	$(srcdir)/ntpsweep.html			\
+	$(srcdir)/ntpsweep-opts.def		\
+	$(srcdir)/ntpsweep-opts			\
+	$(srcdir)/invoke-ntpsweep.texi		\
+	$(srcdir)/invoke-ntpsweep.menu		\
+	$(NULL)
 
 ntpsweep: $(srcdir)/ntpsweep-opts
 
@@ -61,7 +62,7 @@ $(srcdir)/ntpsweep.mdoc.in: $(srcdir)/ntpsweep.1ntpsweepmdoc $(top_srcdir)/sntp/
 
 ### Manpage
 
-$(srcdir)/ntpsweep.1: $(srcdir)/ntpsweep.$(MANTAGFMT).in $(top_builddir)/config.status
+ntpsweep.1: $(srcdir)/ntpsweep.$(MANTAGFMT).in $(top_builddir)/config.status
 	$(top_builddir)/config.status --file=ntpsweep.1+:$(srcdir)/ntpsweep.$(MANTAGFMT).in
 	mv ntpsweep.1+ ntpsweep.1
 
diff --git a/scripts/ntpsweep/invoke-ntpsweep.texi b/scripts/ntpsweep/invoke-ntpsweep.texi
index a00399416..5ccc2af51 100644
--- a/scripts/ntpsweep/invoke-ntpsweep.texi
+++ b/scripts/ntpsweep/invoke-ntpsweep.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsweep.texi)
 #
-# It has been AutoGen-ed  December 18, 2013 at 10:51:05 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  December 19, 2013 at 07:48:51 AM by AutoGen 5.18.3pre7
 # From the definitions    ntpsweep-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntpsweep/ntpsweep.in b/scripts/ntpsweep/ntpsweep.in
index 4e640b3f2..fed35d17e 100644
--- a/scripts/ntpsweep/ntpsweep.in
+++ b/scripts/ntpsweep/ntpsweep.in
@@ -22,7 +22,6 @@ package ntpsweep;
 use 5.006_000;
 use strict;
 use lib "@PERLLIBDIR@";
-use lib "@abs_top_srcdir@/scripts/lib";
 use NTP::Util qw(do_dns ntp_read_vars ntp_peers ntp_sntp_line);
 
 (my $program = $0) =~ s%.*/(.+?)(.pl)?$%$1%;
diff --git a/scripts/ntptrace/Makefile.am b/scripts/ntptrace/Makefile.am
index 91cc97ba9..fe484b455 100644
--- a/scripts/ntptrace/Makefile.am
+++ b/scripts/ntptrace/Makefile.am
@@ -4,7 +4,7 @@ bin_SCRIPTS =	$(NTPTRACE_DB)
 libexec_SCRIPTS =	$(NTPTRACE_DL)
 sbin_SCRIPTS =	$(NTPTRACE_DS)
 
-run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
+run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)" PERL5LIB="$(abs_top_srcdir)/scripts/lib"	\
 		autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
 		--writable
 
@@ -16,7 +16,6 @@ EXTRA_DIST = 	\
 	$(srcdir)/ntptrace.1ntptracemdoc	\
 	$(srcdir)/ntptrace.texi	\
 	$(srcdir)/ntptrace.html	\
-	$(srcdir)/ntptrace.1		\
 	$(srcdir)/ntptrace-opts.def	\
 	$(srcdir)/ntptrace-opts	\
 	$(srcdir)/invoke-ntptrace.texi	\
@@ -30,7 +29,6 @@ noinst_DATA = \
 	$(srcdir)/ntptrace.1ntptracemdoc	\
 	$(srcdir)/ntptrace.texi	\
 	$(srcdir)/ntptrace.html	\
-	$(srcdir)/ntptrace.1		\
 	$(srcdir)/ntptrace-opts.def	\
 	$(srcdir)/ntptrace-opts	\
 	$(srcdir)/invoke-ntptrace.texi	\
@@ -65,11 +63,11 @@ $(srcdir)/ntptrace.mdoc.in: $(srcdir)/ntptrace.1ntptracemdoc $(top_srcdir)/sntp/
 	sed -f $(top_srcdir)/sntp/scripts/mansec2subst.sed $(srcdir)/ntptrace.1ntptracemdoc > $(srcdir)/ntptrace.mdoc.in+
 	mv $(srcdir)/ntptrace.mdoc.in+ $(srcdir)/ntptrace.mdoc.in
 
-### Manpage
+### Manpage (local)
 
-$(srcdir)/ntptrace.1: $(srcdir)/ntptrace.$(MANTAGFMT).in $(top_builddir)/config.status
-	$(top_builddir)/config.status --file=ntptrace.1+:$(srcdir)/ntptrace.$(MANTAGFMT).in
-	mv ntptrace.1+ ntptrace.1
+ntptrace.$(NTPTRACE_MS): $(srcdir)/ntptrace.$(MANTAGFMT).in $(top_builddir)/config.status
+	$(top_builddir)/config.status --file=ntptrace.$(NTPTRCE_MS)+:$(srcdir)/ntptrace.$(MANTAGFMT).in
+	mv ntptrace.$(NTPTRCE_MS)+ ntptrace.$(NTPTRCE_MS)
 
 ### Texinfo
 
diff --git a/scripts/ntptrace/invoke-ntptrace.texi b/scripts/ntptrace/invoke-ntptrace.texi
index fa8d24cef..bf523ffcc 100644
--- a/scripts/ntptrace/invoke-ntptrace.texi
+++ b/scripts/ntptrace/invoke-ntptrace.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntptrace.texi)
 #
-# It has been AutoGen-ed  December 18, 2013 at 10:51:51 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  December 19, 2013 at 07:48:56 AM by AutoGen 5.18.3pre7
 # From the definitions    ntptrace-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntptrace/ntptrace.in b/scripts/ntptrace/ntptrace.in
index f87572ed9..7cc5ce7f7 100755
--- a/scripts/ntptrace/ntptrace.in
+++ b/scripts/ntptrace/ntptrace.in
@@ -5,7 +5,6 @@ package ntptrace;
 use 5.006_000;
 use strict;
 use lib "@PERLLIBDIR@";
-use lib "@abs_top_srcdir@/scripts/lib";
 use NTP::Util qw(ntp_read_vars do_dns);
 
 exit run(@ARGV) unless caller;
diff --git a/sntp/loc/debian b/sntp/loc/debian
index c298b5968..2dbfc43f5 100644
--- a/sntp/loc/debian
+++ b/sntp/loc/debian
@@ -1,5 +1,6 @@
 # Debian installations and man page suffixes
 MDOC
+calc_tickadj,sbin,8
 ntp-keygen,sbin,8
 ntp-wait,sbin,8
 ntpd,sbin,8
diff --git a/sntp/loc/legacy b/sntp/loc/legacy
index 9ca438c9e..a5c274bcb 100644
--- a/sntp/loc/legacy
+++ b/sntp/loc/legacy
@@ -1,5 +1,6 @@
 # Legacy installations and man page suffixes
 MAN
+calc_tickadj,bin,1
 ntp-keygen,bin,1
 ntp-wait,bin,1
 ntpd,bin,1
diff --git a/sntp/loc/redhat b/sntp/loc/redhat
index 5b84f3685..730379361 100644
--- a/sntp/loc/redhat
+++ b/sntp/loc/redhat
@@ -1,5 +1,6 @@
 # RedHat/Fedora installations and man page suffixes
 MAN
+calc_tickadj,sbin,8
 ntp-keygen,sbin,8
 ntp-wait,sbin,8
 ntpd,sbin,8
diff --git a/sntp/loc/solaris b/sntp/loc/solaris
index 33b024092..51bddb7ec 100644
--- a/sntp/loc/solaris
+++ b/sntp/loc/solaris
@@ -1,5 +1,6 @@
 # Solaris installations and man page suffixes
 MAN
+calc_tickadj,sbin,1m
 ntp-keygen,sbin,1m
 ntp-wait,libexec,1m
 ntpd,libexec,1m
diff --git a/sntp/m4/ntp_locinfo.m4 b/sntp/m4/ntp_locinfo.m4
index 7b8159d30..3efd2ce94 100644
--- a/sntp/m4/ntp_locinfo.m4
+++ b/sntp/m4/ntp_locinfo.m4
@@ -44,6 +44,10 @@ case "$GENLOCINFO" in
     ;;
 esac
 
+AC_SUBST([CALC_TICKADJ_DB])
+AC_SUBST([CALC_TICKADJ_DL])
+AC_SUBST([CALC_TICKADJ_DS])
+AC_SUBST([CALC_TICKADJ_MS])
 AC_SUBST([MANTAGFMT])
 AC_SUBST([NTPDATE_DB])
 AC_SUBST([NTPDATE_DL])