Makefile.in, Makefile.am, refclock_oncore.c:

  * libparse/Makefile.am:  Make it work with non-GNU make.
  * ntpd/refclock_oncore.c: Patches/improvements, From: Reg Clemens <reg@dwf.com>

bk: 389e0c8dl_ncaPdZ_Qhsa0f4narZDw

diff --git a/Makefile.in b/Makefile.in
index decac23d69b45c51eab3867bc329ba203666a1ca..761c3cf7da3e2a9b7fee9f976e8319a13786a6f2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,10 +143,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = 
 DIST_SOURCES = 
-DIST_COMMON =  README ./stamp-h.in ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess config.h.in \
-config.sub configure configure.in depcomp install-sh missing \
-mkinstalldirs
+DIST_COMMON =  README ./config.guess ./config.sub ./stamp-h.in ChangeLog \
+INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
+config.guess config.h.in config.sub configure configure.in depcomp \
+install-sh missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index d7479e75d89c95f266c04909c98103b4b7ac062e..93a5a64abd5a4dc80556f5ca37592d931cbc68ed 100644 (file)
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -51,44 +51,83 @@ info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
        sed -n -f mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > info_trimble.c || rm -f info_trimble.c
        sed -n -f mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.c || rm -f info_trimble.c
 
-kclk_computime$U.o: clk_computime$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_computime.o: clk_computime.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_computime.c -o $@
 
-kclk_dcf7000$U.o: clk_dcf7000$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_computime_.o: clk_computime_.c
+       $(COMPILE) -DPARSESTREAM -c clk_computime_.c -o $@
 
-kclk_hopf6021$U.o: clk_hopf6021$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_dcf7000.o: clk_dcf7000.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_dcf7000.c -o $@
 
-kclk_meinberg$U.o: clk_meinberg$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_dcf7000_.o: clk_dcf7000_.c
+       $(COMPILE) -DPARSESTREAM -c clk_dcf7000_.c -o $@
 
-kclk_rawdcf$U.o: clk_rawdcf$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_hopf6021.o: clk_hopf6021.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_hopf6021.c -o $@
 
-kclk_rcc8000$U.o: clk_rcc8000$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_hopf6021_.o: clk_hopf6021_.c
+       $(COMPILE) -DPARSESTREAM -c clk_hopf6021_.c -o $@
 
-kclk_schmid$U.o: clk_schmid$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_meinberg.o: clk_meinberg.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_meinberg.c -o $@
 
-kclk_trimtaip$U.o: clk_trimtaip$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_meinberg_.o: clk_meinberg_.c
+       $(COMPILE) -DPARSESTREAM -c clk_meinberg_.c -o $@
 
-kclk_trimtsip$U.o: clk_trimtsip$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_rawdcf.o: clk_rawdcf.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_rawdcf.c -o $@
 
-kclk_varitext$U.o: clk_varitext$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_rawdcf_.o: clk_rawdcf_.c
+       $(COMPILE) -DPARSESTREAM -c clk_rawdcf_.c -o $@
 
-kclk_wharton$U.o: clk_wharton$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_rcc8000.o: clk_rcc8000.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_rcc8000.c -o $@
 
-kparse$U.o: parse$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_rcc8000_.o: clk_rcc8000_.c
+       $(COMPILE) -DPARSESTREAM -c clk_rcc8000_.c -o $@
 
-kparse_conf$U.o: parse_conf$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_schmid.o: clk_schmid.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_schmid.c -o $@
+
+kclk_schmid_.o: clk_schmid_.c
+       $(COMPILE) -DPARSESTREAM -c clk_schmid_.c -o $@
+
+kclk_trimtaip.o: clk_trimtaip.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_trimtaip.c -o $@
+
+kclk_trimtaip_.o: clk_trimtaip_.c
+       $(COMPILE) -DPARSESTREAM -c clk_trimtaip_.c -o $@
+
+kclk_trimtsip.o: clk_trimtsip.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_trimtsip.c -o $@
+
+kclk_trimtsip_.o: clk_trimtsip_.c
+       $(COMPILE) -DPARSESTREAM -c clk_trimtsip_.c -o $@
+
+kclk_varitext.o: clk_varitext.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_varitext.c -o $@
+
+kclk_varitext_.o: clk_varitext_.c
+       $(COMPILE) -DPARSESTREAM -c clk_varitext_.c -o $@
+
+kclk_wharton.o: clk_wharton.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_wharton.c -o $@
+
+kclk_wharton_.o: clk_wharton_.c
+       $(COMPILE) -DPARSESTREAM -c clk_wharton_.c -o $@
+
+kparse.o: parse.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/parse.c -o $@
+
+kparse_.o: parse_.c
+       $(COMPILE) -DPARSESTREAM -c parse_.c -o $@
+
+kparse_conf.o: parse_conf.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/parse_conf.c -o $@
+
+kparse_conf_.o: parse_conf_.c
+       $(COMPILE) -DPARSESTREAM -c parse_conf_.c -o $@
 
 parsestreams.loadable_module.o: $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
        $(LD) -r -o $@ $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a

diff --git a/libparse/Makefile.in b/libparse/Makefile.in
index 8682c2bc8ba78a379f39a4cd94f905a501cbccfb..53db2699657b3a50387a82963cbd319516e0f0a1 100644 (file)
--- a/libparse/Makefile.in
+++ b/libparse/Makefile.in
@@ -494,44 +494,83 @@ info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
        sed -n -f mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > info_trimble.c || rm -f info_trimble.c
        sed -n -f mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.c || rm -f info_trimble.c
 
-kclk_computime$U.o: clk_computime$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_computime.o: clk_computime.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_computime.c -o $@
 
-kclk_dcf7000$U.o: clk_dcf7000$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_computime_.o: clk_computime_.c
+       $(COMPILE) -DPARSESTREAM -c clk_computime_.c -o $@
 
-kclk_hopf6021$U.o: clk_hopf6021$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_dcf7000.o: clk_dcf7000.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_dcf7000.c -o $@
 
-kclk_meinberg$U.o: clk_meinberg$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_dcf7000_.o: clk_dcf7000_.c
+       $(COMPILE) -DPARSESTREAM -c clk_dcf7000_.c -o $@
 
-kclk_rawdcf$U.o: clk_rawdcf$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_hopf6021.o: clk_hopf6021.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_hopf6021.c -o $@
 
-kclk_rcc8000$U.o: clk_rcc8000$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_hopf6021_.o: clk_hopf6021_.c
+       $(COMPILE) -DPARSESTREAM -c clk_hopf6021_.c -o $@
 
-kclk_schmid$U.o: clk_schmid$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_meinberg.o: clk_meinberg.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_meinberg.c -o $@
 
-kclk_trimtaip$U.o: clk_trimtaip$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_meinberg_.o: clk_meinberg_.c
+       $(COMPILE) -DPARSESTREAM -c clk_meinberg_.c -o $@
 
-kclk_trimtsip$U.o: clk_trimtsip$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_rawdcf.o: clk_rawdcf.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_rawdcf.c -o $@
 
-kclk_varitext$U.o: clk_varitext$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_rawdcf_.o: clk_rawdcf_.c
+       $(COMPILE) -DPARSESTREAM -c clk_rawdcf_.c -o $@
 
-kclk_wharton$U.o: clk_wharton$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_rcc8000.o: clk_rcc8000.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_rcc8000.c -o $@
 
-kparse$U.o: parse$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_rcc8000_.o: clk_rcc8000_.c
+       $(COMPILE) -DPARSESTREAM -c clk_rcc8000_.c -o $@
 
-kparse_conf$U.o: parse_conf$U.c
-       $(COMPILE) -DPARSESTREAM -c $< -o $@
+kclk_schmid.o: clk_schmid.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_schmid.c -o $@
+
+kclk_schmid_.o: clk_schmid_.c
+       $(COMPILE) -DPARSESTREAM -c clk_schmid_.c -o $@
+
+kclk_trimtaip.o: clk_trimtaip.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_trimtaip.c -o $@
+
+kclk_trimtaip_.o: clk_trimtaip_.c
+       $(COMPILE) -DPARSESTREAM -c clk_trimtaip_.c -o $@
+
+kclk_trimtsip.o: clk_trimtsip.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_trimtsip.c -o $@
+
+kclk_trimtsip_.o: clk_trimtsip_.c
+       $(COMPILE) -DPARSESTREAM -c clk_trimtsip_.c -o $@
+
+kclk_varitext.o: clk_varitext.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_varitext.c -o $@
+
+kclk_varitext_.o: clk_varitext_.c
+       $(COMPILE) -DPARSESTREAM -c clk_varitext_.c -o $@
+
+kclk_wharton.o: clk_wharton.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_wharton.c -o $@
+
+kclk_wharton_.o: clk_wharton_.c
+       $(COMPILE) -DPARSESTREAM -c clk_wharton_.c -o $@
+
+kparse.o: parse.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/parse.c -o $@
+
+kparse_.o: parse_.c
+       $(COMPILE) -DPARSESTREAM -c parse_.c -o $@
+
+kparse_conf.o: parse_conf.c
+       $(COMPILE) -DPARSESTREAM -c $(srcdir)/parse_conf.c -o $@
+
+kparse_conf_.o: parse_conf_.c
+       $(COMPILE) -DPARSESTREAM -c parse_conf_.c -o $@
 
 parsestreams.loadable_module.o: $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
        $(LD) -r -o $@ $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a

diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index a71835f30528cf9ac33dc2e345d61966187f2078..b0df60967a5d72b7f2d98e4386bc1f8166472617 100644 (file)
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -34,7 +34,8 @@
  *  or /etc/ntp.oncore
  * --------------------------------------------------------------------------
  * Reg.Clemens <reg@dwf.com> Sep98.
- *  With these mods it works on SunOS, Solaris and Linux
+ *  Original code written for FreeBSD.
+ *  With these mods it works on FreeBSD, SunOS, Solaris and Linux
  *    (SunOS 4.1.3 + ppsclock)
  *    (Solaris7 + MU4)
  *    (RedHat 5.1 2.0.35 + PPSKit, 2.1.126 + or later).