Copyright cleanup

bk: 44853b200bK6I9PC9QjODkv4EI_cYA

diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am
index 239bcebe816721bad3b4111156cfc6d03c9066bd..e8eb85a96c3195bd65c1df67586280d256be254c 100644 (file)
--- a/clockstuff/Makefile.am
+++ b/clockstuff/Makefile.am
@@ -11,6 +11,8 @@ clktest_LDADD = ../libntp/libntp.a
 ETAGS_ARGS = Makefile.am
 #EXTRA_DIST = TAGS
 
+# clktest-opts.def wants ../include/copyright.def
+
 chutest$(EXEEXT): ../libntp/libntp.a
 
 clktest$(EXEEXT): ../libntp/libntp.a

diff --git a/clockstuff/clktest-opts.def b/clockstuff/clktest-opts.def
index 9b9f99dd096160b347390a4a5a57c0867bbacb91..43e7a6d882656340aeefd789316f7b62d85282a4 100644 (file)
--- a/clockstuff/clktest-opts.def
+++ b/clockstuff/clktest-opts.def
@@ -2,28 +2,6 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
 prog-name      = "clktest";
 prog-title     = "test the clock line discipline";
 argument       = '<tty_device>';

diff --git a/include/copyright.def b/include/copyright.def
index cac5f53b27da9c2bb2691ea06dda59638409a769..f6fb4c8ea7ffaf3cc5c221f354d7ecac8240b6b0 100644 (file)
--- a/include/copyright.def
+++ b/include/copyright.def
@@ -1,10 +1,11 @@
 /* -*- Mode: Text -*- */
 
 copyright = {
-    date  = "1970-2004";
+    date  = "1970-2006";
     owner = "ntp.org";
     eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
+    type  = note;
+    text  = "see html/copyright.html";
 };
 
 #ifndef __windows__

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index e22604b9987c980f6267495053bef7d67589b9c9..b1b5e46fa02d681d78d0244ae93ac67ebf4ce252 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -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 $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpd-opts.c: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) ntpd-opts.def
 
-$(srcdir)/ntpd.1: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpd.1: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) -Tagman1.tpl -bntpd ntpd-opts.def
 
-$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.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 $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdsim-opts.c: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) ntpdsim-opts.def
 
-$(srcdir)/ntpdsim.1: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdsim.1: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) -Tagman1.tpl -bntpdsim ntpdsim-opts.def
 
-$(srcdir)/ntpdsim-opts.texi $(srcdir)/ntpdsim-opts.menu: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdsim-opts.texi $(srcdir)/ntpdsim-opts.menu: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpdsim-opts.def
 
 $(PROGRAMS): $(LDADD)

diff --git a/ntpd/ntpd-opts.def b/ntpd/ntpd-opts.def
index b821627111df6e8eb2b65d15574a0047a9b99a77..ad280177b87928ad895720abfe1376910f4d0d86 100644 (file)
--- a/ntpd/ntpd-opts.def
+++ b/ntpd/ntpd-opts.def
@@ -2,34 +2,7 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
-copyright = {
-    date  = "1970-2004";
-    owner = "ntp.org";
-    eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
-};
+#include copyright.def
 
 prog-name      = "ntpd";
 prog-title     = "NTP daemon program";

diff --git a/ntpd/ntpdbase-opts.def b/ntpd/ntpdbase-opts.def
index f0aa2a4516c7b6760b608510923bd140d9503995..a06f352fe8540765e3c6a2712bafe3e45da048aa 100644 (file)
--- a/ntpd/ntpdbase-opts.def
+++ b/ntpd/ntpdbase-opts.def
@@ -1,17 +1,4 @@
 
-#ifndef __windows__
-rcfile         = ".ntprc";
-#else
-rcfile         = "ntp.ini";
-#endif
-
-environrc;
-
-version         = `
-eval VERSION=\`sed -e 's/.*,\\[//' -e 's/\\].*//' < ../version.m4\`
-[ -z "${VERSION}" ] && echo "Cannot determine VERSION" && kill -TERM $AG_pid
-echo $VERSION`;
-
 test-main;
 
 flag = {

diff --git a/ntpd/ntpdsim-opts.def b/ntpd/ntpdsim-opts.def
index 60db112fb3305773b4a9442020fb1ac22a56d13d..f6ede78000646b207a52b1a7abd70f8f4fdabc25 100644 (file)
--- a/ntpd/ntpdsim-opts.def
+++ b/ntpd/ntpdsim-opts.def
@@ -2,34 +2,7 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
-copyright = {
-    date  = "1970-2004";
-    owner = "ntp.org";
-    eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
-};
+#include copyright.def
 
 prog-name      = "ntpdsim";
 prog-title     = "NTP daemon simulation program";

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 9c5874f4f5735c81229f8291b18895591337d5da..4d44e839f4a6eb9c3b7beb7210f898e62a28c148 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -22,13 +22,13 @@ man_MANS=   ntpdc.1
 run_ag=         cd $(srcdir) && autogen -L ../include
 
 $(srcdir)/ntpdc-opts.h: ntpdc-opts.c
-$(srcdir)/ntpdc-opts.c: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdc-opts.c: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) ntpdc-opts.def
 
-$(srcdir)/ntpdc.1: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdc.1: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) -Tagman1.tpl -bntpdc ntpdc-opts.def
 
-$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.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 49985c3802cc66da6266d94072f8dd7c7c6b288c..10dc535568ed0f218a916a665e3bccb9ceaf97fd 100644 (file)
--- a/ntpdc/ntpdc-opts.def
+++ b/ntpdc/ntpdc-opts.def
@@ -2,28 +2,6 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
 prog-name      = "ntpdc";
 prog-title     = "vendor-specific NTP query program";
 

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index d755aec02e67edea41fc32bc35f4b57d1a63b2fd..24eb0d787a8eb8a5a1f967369b1a580cf04d4f40 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -15,13 +15,13 @@ 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 $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpq-opts.c: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) ntpq-opts.def
 
-$(srcdir)/ntpq.1: ntpq-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpq.1: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) -Tagman1.tpl -bntpq ntpq-opts.def
 
-$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu: ntpq-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.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 875def061efce9cddaae69c933ecb3337ed201b8..57204001b3c3c6011947310b2113a7be7038fafd 100644 (file)
--- a/ntpq/ntpq-opts.def
+++ b/ntpq/ntpq-opts.def
@@ -2,35 +2,7 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
-copyright = {
-    date  = "1970-2004";
-    owner = "ntp.org";
-    eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
-};
-
+#include copyright.def
 
 prog-name      = "ntpq";
 prog-title     = "standard NTP query program";
@@ -39,19 +11,6 @@ long-opts;
 config-header  = config.h;
 argument       = '[ host ...]';
 
-#ifndef __windows__
-rcfile         = ".ntprc";
-#else
-rcfile         = "ntp.ini";
-#endif
-
-environrc;
-
-version         = `
-eval VERSION=\`sed -e 's/.*,\\[//' -e 's/\\].*//' < ../version.m4\`
-[ -z "${VERSION}" ] && echo "Cannot determine VERSION" && kill -TERM $AG_pid
-echo $VERSION`;
-
 test-main;
 
 flag = {

diff --git a/sntp/sntp-opts.def b/sntp/sntp-opts.def
index 91cf8a83db58329c4fe8913fa07998b85e789fc0..ef2e341bd6ab4142fbd9a5c67e5edd7808490ea1 100644 (file)
--- a/sntp/sntp-opts.def
+++ b/sntp/sntp-opts.def
@@ -2,33 +2,12 @@
 
 autogen definitions options;
 
-/*
- *   $Id: opts.def,v 3.34 2004/10/15 01:48:34 bkorb Exp $
- *
- *  NTP copyright 1970-2004 Someone
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
 copyright = {
-    date  = "1970-2005";
+    date  = "1970-2006";
     owner = "ntp.org";
     eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
+    type  = note;
+    text  = 'See the sntp/Copyright file';
 };
 
 

diff --git a/util/Makefile.am b/util/Makefile.am
index ba147b2128d25a798bf0bccc89e7c6e1cdcaefc7..7610c2d730c990ffc7bfce48da2ef45f1d9ce23c 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -21,13 +21,13 @@ man_MANS=   ntp-keygen.1
 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 $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntp-keygen-opts.c: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) ntp-keygen-opts.def
 
-$(srcdir)/ntp-keygen.1: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntp-keygen.1: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.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 $(top_srcdir)/include/debug-opt.def
+$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntp-keygen-opts.def
 
 

diff --git a/util/ntp-keygen-opts.def b/util/ntp-keygen-opts.def
index c4aa3c67d43f2f5d0a58515ea2c6f0d94e045a2d..898c2fc33b26e05df01fd24ce4fba4b14b1e897b 100644 (file)
--- a/util/ntp-keygen-opts.def
+++ b/util/ntp-keygen-opts.def
@@ -2,43 +2,14 @@
 
 autogen definitions options;
 
-/*
- *   $Id: sntp-opts.def,v 1.1.1.1 2005/12/14 00:29:10 bkorb Exp $
- *
- *  NTP copyright 1970-2005 ntp.org
- *
- *  NTP is free software.
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2, or (at your option) any later version.
- *
- *  AutoGen is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with AutoGen.  See the file "COPYING".  If not,
- *  write to:  The Free Software Foundation, Inc.,
- *             59 Temple Place - Suite 330,
- *             Boston,  MA  02111-1307, USA.
- */
-
-copyright = {
-    date  = "1970-2005";
-    owner = "ntp.org";
-    eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
-    type  = bsd;
-};
-
+#include copyright.def
 
 prog-name      = "ntp-keygen";
 prog-title     = "Create a NTP host key";
 package        = ntp;
-homerc         =  $HOME, ".";
-rcfile         = '.ntprc';
+
 long-opts;
-environrc;
+
 test-main;
 
 config-header  = "config.h";