debug-opts.def cleanup

Allow optional hostnames on the command line for ntpq and ntpdc.

bk: 442674adt-We722lqVcUzo3ovMfNfw

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 27890c63ab03b050f90d30ff61141a69526320b1..e22604b9987c980f6267495053bef7d67589b9c9 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -31,7 +31,7 @@ ETAGS_ARGS = Makefile.am
 ###                                                    Y2Kfixes
 check_PROGRAMS = @MAKE_CHECK_Y2K@
 EXTRA_PROGRAMS = check_y2k ntpdsim
-run_ag = cd $(srcdir) && autogen -L $(top_srcdir)/include
+run_ag = cd $(srcdir) && autogen -L ../include
 
 check-local: @MAKE_CHECK_Y2K@
        test -z "@MAKE_CHECK_Y2K@" || ./@MAKE_CHECK_Y2K@
@@ -61,23 +61,23 @@ libntpd_a_SOURCES = jupiter.h ntp_control.c \
        refclock_zyfer.c
 
 $(srcdir)/ntpd-opts.h: ntpd-opts.c
-$(srcdir)/ntpd-opts.c: ntpd-opts.def ntpdbase-opts.def
+$(srcdir)/ntpd-opts.c: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) ntpd-opts.def
 
-$(srcdir)/ntpd.1: ntpd-opts.def ntpdbase-opts.def
+$(srcdir)/ntpd.1: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Tagman1.tpl -bntpd ntpd-opts.def
 
-$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu: ntpd-opts.def
+$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpd-opts.def
 
 $(srcdir)/ntpdsim-opts.h: ntpdsim-opts.c
-$(srcdir)/ntpdsim-opts.c: ntpdsim-opts.def ntpdbase-opts.def
+$(srcdir)/ntpdsim-opts.c: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) ntpdsim-opts.def
 
-$(srcdir)/ntpdsim.1: ntpdsim-opts.def ntpdbase-opts.def
+$(srcdir)/ntpdsim.1: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Tagman1.tpl -bntpdsim ntpdsim-opts.def
 
-$(srcdir)/ntpdsim-opts.texi $(srcdir)/ntpdsim-opts.menu: ntpdsim-opts.def
+$(srcdir)/ntpdsim-opts.texi $(srcdir)/ntpdsim-opts.menu: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpdsim-opts.def
 
 $(PROGRAMS): $(LDADD)

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index c08aaa1a1f452a81c0f69524fd31adc4a17a9069..9c5874f4f5735c81229f8291b18895591337d5da 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -19,16 +19,16 @@ EXTRA_DIST= nl_in.c nl.pl layout.std        \
 BUILT_SOURCES+=        ntpdc-opts.c ntpdc-opts.h ntpdc.1 ntpdc-opts.texi       \
                ntpdc-opts.menu
 man_MANS=      ntpdc.1
-run_ag=         cd $(srcdir) && autogen -L $(top_srcdir)/include
+run_ag=         cd $(srcdir) && autogen -L ../include
 
 $(srcdir)/ntpdc-opts.h: ntpdc-opts.c
-$(srcdir)/ntpdc-opts.c: ntpdc-opts.def
+$(srcdir)/ntpdc-opts.c: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) ntpdc-opts.def
 
-$(srcdir)/ntpdc.1: ntpdc-opts.def
+$(srcdir)/ntpdc.1: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Tagman1.tpl -bntpdc ntpdc-opts.def
 
-$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu: ntpdc-opts.def
+$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpdc-opts.def
 
 ntpdc_SOURCES = ntpdc.c ntpdc_ops.c ntpdc-opts.c ntpdc-opts.h

diff --git a/ntpdc/ntpdc-opts.def b/ntpdc/ntpdc-opts.def
index 2845c95e80df1db87dd2e0c131a6ef4168da4466..88b7065fd4918205b1a865721238a7b1f7694dc8 100644 (file)
--- a/ntpdc/ntpdc-opts.def
+++ b/ntpdc/ntpdc-opts.def
@@ -37,6 +37,7 @@ prog-title     = "vendor-specific NTP query program";
 homerc         =  $HOME, ".";
 long-opts;
 config-header  = config.h;
+argument       = '[ host ...]';
 
 #ifndef __windows__
 rcfile         = ".ntprc";

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 3f0d42b4789e4442f697ee69a8cc68380fd97107..d755aec02e67edea41fc32bc35f4b57d1a63b2fd 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -11,17 +11,17 @@ ETAGS_ARGS= Makefile.am
 EXTRA_DIST=    ntpq-opts.def ntpq.1 ntpq-opts.texi ntpq-opts.menu
 BUILT_SOURCES= ntpq-opts.c ntpq-opts.h ntpq.1 ntpq-opts.texi ntpq-opts.menu
 man_MANS=      ntpq.1
-run_ag=         cd $(srcdir) && autogen -L $(top_srcdir)/include
+run_ag=         cd $(srcdir) && autogen -L ../include
 ntpq_SOURCES=  ntpq.c ntpq-subs.c ntpq-opts.c ntpq-opts.h
 
 $(srcdir)/ntpq-opts.h: ntpq-opts.c
-$(srcdir)/ntpq-opts.c: ntpq-opts.def
+$(srcdir)/ntpq-opts.c: ntpq-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) ntpq-opts.def
 
-$(srcdir)/ntpq.1: ntpq-opts.def
+$(srcdir)/ntpq.1: ntpq-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Tagman1.tpl -bntpq ntpq-opts.def
 
-$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu: ntpq-opts.def
+$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu: ntpq-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpq-opts.def
 
 $(PROGRAMS): $(LDADD)

diff --git a/ntpq/ntpq-opts.def b/ntpq/ntpq-opts.def
index 8f9824574d77c04ef9cb5176541096fcc8eb9687..875def061efce9cddaae69c933ecb3337ed201b8 100644 (file)
--- a/ntpq/ntpq-opts.def
+++ b/ntpq/ntpq-opts.def
@@ -37,6 +37,7 @@ prog-title     = "standard NTP query program";
 homerc         =  $HOME, ".";
 long-opts;
 config-header  = config.h;
+argument       = '[ host ...]';
 
 #ifndef __windows__
 rcfile         = ".ntprc";
@@ -90,6 +91,8 @@ flag = {
        _EndOfDoc_;
 };
 
+#include debug-opt.def
+
 flag = {
     name      = peers;
     value     = p;
@@ -112,31 +115,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    name      = debug-level;
-    value     = d;
-    max       = NOLIMIT;
-    descrip   = "Increase output debug message level";
-    doc = <<-  _EndOfDoc_
-       Increase the debugging message output level.  Can be supplied multiple times.
-       _EndOfDoc_;
-};
-
-flag = {
-    name      = set-debug-level;
-    value     = D;
-    max       = NOLIMIT;
-    descrip   = "Set the output debug message level";
-    arg-type  = string;
-    flag-code = <<- _EOS_
-       DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
-       _EOS_;
-    doc = <<-  _EndOfDoc_
-       Set the output debugging level.  Can be supplied multiple times,
-       but each overrides the previous value(s).
-       _EndOfDoc_;
-};
-
 flag = {
     name      = numeric;
     value     = n;

diff --git a/util/Makefile.am b/util/Makefile.am
index ed082f9688befe752211ea796dd51882a878637e..ba147b2128d25a798bf0bccc89e7c6e1cdcaefc7 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -18,16 +18,16 @@ EXTRA_DIST= ntp-keygen-opts.def ntp-keygen.1 ntp-keygen-opts.texi ntp-keygen-opt
 BUILT_SOURCES= ntp-keygen-opts.c ntp-keygen-opts.h ntp-keygen.1        \
                ntp-keygen-opts.texi ntp-keygen-opts.menu
 man_MANS=      ntp-keygen.1
-run_ag=         cd $(srcdir) && autogen -L $(top_srcdir)/include
+run_ag=         cd $(srcdir) && autogen -L ../include
 
 $(srcdir)/ntp-keygen-opts.h: ntp-keygen-opts.c
-$(srcdir)/ntp-keygen-opts.c: ntp-keygen-opts.def
+$(srcdir)/ntp-keygen-opts.c: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) ntp-keygen-opts.def
 
-$(srcdir)/ntp-keygen.1: ntp-keygen-opts.def
+$(srcdir)/ntp-keygen.1: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Tagman1.tpl -bntp-keygen ntp-keygen-opts.def
 
-$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu: ntp-keygen-opts.def
+$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntp-keygen-opts.def