aboutsummaryrefslogtreecommitdiff
path: root/libparse
diff options
context:
space:
mode:
Diffstat (limited to 'libparse')
-rw-r--r--libparse/Makefile.am80
-rw-r--r--libparse/Makefile.in355
-rw-r--r--libparse/clk_computime.c6
-rw-r--r--libparse/clk_dcf7000.c6
-rw-r--r--libparse/clk_hopf6021.c6
-rw-r--r--libparse/clk_meinberg.c8
-rw-r--r--libparse/clk_rawdcf.c6
-rw-r--r--libparse/clk_rcc8000.c6
-rw-r--r--libparse/clk_schmid.c6
-rw-r--r--libparse/clk_trimtaip.c6
-rw-r--r--libparse/clk_trimtsip.c17
-rw-r--r--libparse/clk_varitext.c6
-rw-r--r--libparse/clk_wharton.c2
-rw-r--r--libparse/data_mbg.c4
-rw-r--r--libparse/gpstolfp.c2
-rw-r--r--libparse/ieee754io.c4
-rw-r--r--libparse/parse.c4
-rw-r--r--libparse/parsesolaris.c50
-rw-r--r--libparse/parsestreams.c46
19 files changed, 339 insertions, 281 deletions
diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index 8e21463b23e3..12b47967de75 100644
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -1,55 +1,63 @@
+NULL=
#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-AUTOMAKE_OPTIONS = ../util/ansi2knr
+AUTOMAKE_OPTIONS =
+BUILT_SOURCES =
noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
EXTRA_LIBRARIES = libparse.a libparse_kernel.a
EXTRA_PROGRAMS = parsestreams parsesolaris
noinst_PROGRAMS = @MAKE_PARSEKMODULE@
-CLEANFILES = libparse.a libparse_kernel.a
+CLEANFILES = libparse.a libparse_kernel.a info_trimble.c
K_CFLAGS = -DPARSESTREAM -DNTP_NEED_BOPS
libparse_a_SOURCES = parse.c \
- parse_conf.c \
- clk_meinberg.c \
- clk_schmid.c \
+ parse_conf.c \
+ clk_meinberg.c \
+ clk_schmid.c \
clk_rawdcf.c \
clk_trimtsip.c \
- clk_dcf7000.c \
- clk_trimtaip.c \
- clk_rcc8000.c \
- clk_hopf6021.c \
- clk_computime.c \
+ clk_dcf7000.c \
+ clk_trimtaip.c \
+ clk_rcc8000.c \
+ clk_hopf6021.c \
+ clk_computime.c \
clk_wharton.c \
clk_varitext.c \
- data_mbg.c \
+ data_mbg.c \
info_trimble.c \
trim_info.c \
binio.c \
ieee754io.c \
mfp_mul.c \
- gpstolfp.c
+ gpstolfp.c \
+ $(NULL)
libparse_kernel_a_SOURCES =
-libparse_kernel_a_LIBADD = kparse$U.o \
- kparse_conf$U.o \
- kclk_computime$U.o \
- kclk_dcf7000$U.o \
- kclk_hopf6021$U.o \
- kclk_meinberg$U.o \
- kclk_rawdcf$U.o \
- kclk_rcc8000$U.o \
- kclk_schmid$U.o \
- kclk_trimtaip$U.o \
- kclk_trimtsip$U.o \
- kclk_varitext$U.o \
- kclk_wharton$U.o \
- kbinio$U.o \
- kieee754io$U.o \
- kmfp_mul$U.o \
- kgpstolfp$U.o
-
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/kernel
+libparse_kernel_a_LIBADD = \
+ kparse.o \
+ kparse_conf.o \
+ kclk_computime.o \
+ kclk_dcf7000.o \
+ kclk_hopf6021.o \
+ kclk_meinberg.o \
+ kclk_rawdcf.o \
+ kclk_rcc8000.o \
+ kclk_schmid.o \
+ kclk_trimtaip.o \
+ kclk_trimtsip.o \
+ kclk_varitext.o \
+ kclk_wharton.o \
+ kbinio.o \
+ kieee754io.o \
+ kmfp_mul.o \
+ kgpstolfp.o \
+ $(NULL)
+
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
+ -I$(top_srcdir)/lib/isc/nothreads/include \
+ -I$(top_srcdir)/lib/isc/unix/include -I$(top_srcdir)/kernel
+
ETAGS_ARGS = Makefile.am
EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
@@ -58,9 +66,9 @@ EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_
# create info_trimble.c
#
info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
- @rm -f info_trimble.c
- sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h > info_trimble.c || rm -f info_trimble.c
- sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.c || rm -f info_trimble.c
+ @rm -f $@
+ sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h > $@ || rm -f $@
+ sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> $@ || rm -f $@
kieee754io.o: ieee754io.c
$(COMPILE) $(K_CFLAGS) -c $(srcdir)/ieee754io.c -o $@
@@ -166,3 +174,5 @@ parsesolaris.o: sys/systm.h
sys/systm.h:
mkdir sys && \
sed -e '/ffs(.*)/d' < /usr/include/sys/systm.h > sys/systm.h
+
+include $(top_srcdir)/depsver.mf
diff --git a/libparse/Makefile.in b/libparse/Makefile.in
index 4b42f7471abd..fcbf5131423c 100644
--- a/libparse/Makefile.in
+++ b/libparse/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,14 +35,20 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-ANSI2KNR = ../util/ansi2knr
EXTRA_PROGRAMS = parsestreams$(EXEEXT) parsesolaris$(EXEEXT)
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/depsver.mf
subdir = libparse
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
- $(top_srcdir)/m4/define_dir.m4 \
- $(top_srcdir)/m4/hs_ulong_const.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
+ $(top_srcdir)/m4/define_dir.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/ntp_cacheversion.m4 \
+ $(top_srcdir)/m4/ntp_dir_sep.m4 \
+ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \
+ $(top_srcdir)/m4/ntp_openssl.m4 \
+ $(top_srcdir)/m4/ntp_vpathhack.m4 \
$(top_srcdir)/m4/os_cflags.m4 $(top_srcdir)/version.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -55,32 +61,34 @@ LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
libparse_a_AR = $(AR) $(ARFLAGS)
libparse_a_LIBADD =
-am_libparse_a_OBJECTS = parse$U.$(OBJEXT) parse_conf$U.$(OBJEXT) \
- clk_meinberg$U.$(OBJEXT) clk_schmid$U.$(OBJEXT) \
- clk_rawdcf$U.$(OBJEXT) clk_trimtsip$U.$(OBJEXT) \
- clk_dcf7000$U.$(OBJEXT) clk_trimtaip$U.$(OBJEXT) \
- clk_rcc8000$U.$(OBJEXT) clk_hopf6021$U.$(OBJEXT) \
- clk_computime$U.$(OBJEXT) clk_wharton$U.$(OBJEXT) \
- clk_varitext$U.$(OBJEXT) data_mbg$U.$(OBJEXT) \
- info_trimble$U.$(OBJEXT) trim_info$U.$(OBJEXT) \
- binio$U.$(OBJEXT) ieee754io$U.$(OBJEXT) mfp_mul$U.$(OBJEXT) \
- gpstolfp$U.$(OBJEXT)
+am__objects_1 =
+am_libparse_a_OBJECTS = parse.$(OBJEXT) parse_conf.$(OBJEXT) \
+ clk_meinberg.$(OBJEXT) clk_schmid.$(OBJEXT) \
+ clk_rawdcf.$(OBJEXT) clk_trimtsip.$(OBJEXT) \
+ clk_dcf7000.$(OBJEXT) clk_trimtaip.$(OBJEXT) \
+ clk_rcc8000.$(OBJEXT) clk_hopf6021.$(OBJEXT) \
+ clk_computime.$(OBJEXT) clk_wharton.$(OBJEXT) \
+ clk_varitext.$(OBJEXT) data_mbg.$(OBJEXT) \
+ info_trimble.$(OBJEXT) trim_info.$(OBJEXT) binio.$(OBJEXT) \
+ ieee754io.$(OBJEXT) mfp_mul.$(OBJEXT) gpstolfp.$(OBJEXT) \
+ $(am__objects_1)
libparse_a_OBJECTS = $(am_libparse_a_OBJECTS)
libparse_kernel_a_AR = $(AR) $(ARFLAGS)
-libparse_kernel_a_DEPENDENCIES = kparse$U.o kparse_conf$U.o \
- kclk_computime$U.o kclk_dcf7000$U.o kclk_hopf6021$U.o \
- kclk_meinberg$U.o kclk_rawdcf$U.o kclk_rcc8000$U.o \
- kclk_schmid$U.o kclk_trimtaip$U.o kclk_trimtsip$U.o \
- kclk_varitext$U.o kclk_wharton$U.o kbinio$U.o kieee754io$U.o \
- kmfp_mul$U.o kgpstolfp$U.o
+am__DEPENDENCIES_1 =
+libparse_kernel_a_DEPENDENCIES = kparse.o kparse_conf.o \
+ kclk_computime.o kclk_dcf7000.o kclk_hopf6021.o \
+ kclk_meinberg.o kclk_rawdcf.o kclk_rcc8000.o kclk_schmid.o \
+ kclk_trimtaip.o kclk_trimtsip.o kclk_varitext.o kclk_wharton.o \
+ kbinio.o kieee754io.o kmfp_mul.o kgpstolfp.o \
+ $(am__DEPENDENCIES_1)
am_libparse_kernel_a_OBJECTS =
libparse_kernel_a_OBJECTS = $(am_libparse_kernel_a_OBJECTS)
PROGRAMS = $(noinst_PROGRAMS)
parsesolaris_SOURCES = parsesolaris.c
-parsesolaris_OBJECTS = parsesolaris$U.$(OBJEXT)
+parsesolaris_OBJECTS = parsesolaris.$(OBJEXT)
parsesolaris_LDADD = $(LDADD)
parsestreams_SOURCES = parsestreams.c
-parsestreams_OBJECTS = parsestreams$U.$(OBJEXT)
+parsestreams_OBJECTS = parsestreams.$(OBJEXT)
parsestreams_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -105,7 +113,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARLIB_DIR = @ARLIB_DIR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -122,14 +129,18 @@ CYGPATH_W = @CYGPATH_W@
DCFD = @DCFD@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+EDITLINE_LIBS = @EDITLINE_LIBS@
EF_LIBS = @EF_LIBS@
EF_PROGS = @EF_PROGS@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FGREP = @FGREP@
GREP = @GREP@
HAVE_INLINE = @HAVE_INLINE@
INSTALL = @INSTALL@
@@ -138,6 +149,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LCRYPTO = @LCRYPTO@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
@@ -146,6 +158,7 @@ LIBOPTS_LDADD = @LIBOPTS_LDADD@
LIBPARSE = @LIBPARSE@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
LTLIBOBJS = @LTLIBOBJS@
@@ -157,15 +170,22 @@ MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
MAKE_LIBPARSE = @MAKE_LIBPARSE@
MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
MAKE_NTPDSIM = @MAKE_NTPDSIM@
+MAKE_NTPSNMPD = @MAKE_NTPSNMPD@
MAKE_NTPTIME = @MAKE_NTPTIME@
MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
MAKE_TICKADJ = @MAKE_TICKADJ@
MAKE_TIMETRIM = @MAKE_TIMETRIM@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENSSL = @OPENSSL@
OPENSSL_INC = @OPENSSL_INC@
OPENSSL_LIB = @OPENSSL_LIB@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -173,23 +193,32 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
PATH_PERL = @PATH_PERL@
PATH_SEPARATOR = @PATH_SEPARATOR@
PATH_SH = @PATH_SH@
+PATH_TEST = @PATH_TEST@
+POSIX_SHELL = @POSIX_SHELL@
PROPDELAY = @PROPDELAY@
RANLIB = @RANLIB@
-READLINE_LIBS = @READLINE_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SNMP_CFLAGS = @SNMP_CFLAGS@
+SNMP_CPPFLAGS = @SNMP_CPPFLAGS@
+SNMP_LIBS = @SNMP_LIBS@
STRIP = @STRIP@
TESTDCF = @TESTDCF@
-U = @U@
VERSION = @VERSION@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -236,62 +265,70 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
+NULL =
#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-AUTOMAKE_OPTIONS = ../util/ansi2knr
+AUTOMAKE_OPTIONS =
+BUILT_SOURCES = .deps-ver
noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
EXTRA_LIBRARIES = libparse.a libparse_kernel.a
noinst_PROGRAMS = @MAKE_PARSEKMODULE@
-CLEANFILES = libparse.a libparse_kernel.a
+CLEANFILES = libparse.a libparse_kernel.a info_trimble.c .deps-ver
K_CFLAGS = -DPARSESTREAM -DNTP_NEED_BOPS
libparse_a_SOURCES = parse.c \
- parse_conf.c \
- clk_meinberg.c \
- clk_schmid.c \
+ parse_conf.c \
+ clk_meinberg.c \
+ clk_schmid.c \
clk_rawdcf.c \
clk_trimtsip.c \
- clk_dcf7000.c \
- clk_trimtaip.c \
- clk_rcc8000.c \
- clk_hopf6021.c \
- clk_computime.c \
+ clk_dcf7000.c \
+ clk_trimtaip.c \
+ clk_rcc8000.c \
+ clk_hopf6021.c \
+ clk_computime.c \
clk_wharton.c \
clk_varitext.c \
- data_mbg.c \
+ data_mbg.c \
info_trimble.c \
trim_info.c \
binio.c \
ieee754io.c \
mfp_mul.c \
- gpstolfp.c
+ gpstolfp.c \
+ $(NULL)
libparse_kernel_a_SOURCES =
-libparse_kernel_a_LIBADD = kparse$U.o \
- kparse_conf$U.o \
- kclk_computime$U.o \
- kclk_dcf7000$U.o \
- kclk_hopf6021$U.o \
- kclk_meinberg$U.o \
- kclk_rawdcf$U.o \
- kclk_rcc8000$U.o \
- kclk_schmid$U.o \
- kclk_trimtaip$U.o \
- kclk_trimtsip$U.o \
- kclk_varitext$U.o \
- kclk_wharton$U.o \
- kbinio$U.o \
- kieee754io$U.o \
- kmfp_mul$U.o \
- kgpstolfp$U.o
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/kernel
+libparse_kernel_a_LIBADD = \
+ kparse.o \
+ kparse_conf.o \
+ kclk_computime.o \
+ kclk_dcf7000.o \
+ kclk_hopf6021.o \
+ kclk_meinberg.o \
+ kclk_rawdcf.o \
+ kclk_rcc8000.o \
+ kclk_schmid.o \
+ kclk_trimtaip.o \
+ kclk_trimtsip.o \
+ kclk_varitext.o \
+ kclk_wharton.o \
+ kbinio.o \
+ kieee754io.o \
+ kmfp_mul.o \
+ kgpstolfp.o \
+ $(NULL)
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
+ -I$(top_srcdir)/lib/isc/nothreads/include \
+ -I$(top_srcdir)/lib/isc/unix/include -I$(top_srcdir)/kernel
+
ETAGS_ARGS = Makefile.am
EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
-all: all-am
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -353,34 +390,29 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-../util/ansi2knr:
- $(am__cd) ../util && $(MAKE) $(AM_MAKEFLAGS) ./ansi2knr
-
-mostlyclean-kr:
- -test "$U" = "" || rm -f *_.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binio$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_computime$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_dcf7000$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_hopf6021$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_meinberg$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_rawdcf$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_rcc8000$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_schmid$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtaip$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtsip$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_varitext$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_wharton$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_mbg$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpstolfp$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ieee754io$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info_trimble$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfp_mul$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_conf$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsesolaris$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsestreams$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trim_info$U.Po@am__quote@
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_computime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_dcf7000.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_hopf6021.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_meinberg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_rawdcf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_rcc8000.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_schmid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtaip.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtsip.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_varitext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_wharton.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_mbg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpstolfp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ieee754io.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info_trimble.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfp_mul.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_conf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsesolaris.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsestreams.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trim_info.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -402,64 +434,6 @@ mostlyclean-kr:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-binio_.c: binio.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/binio.c; then echo $(srcdir)/binio.c; else echo binio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_computime_.c: clk_computime.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_computime.c; then echo $(srcdir)/clk_computime.c; else echo clk_computime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_dcf7000_.c: clk_dcf7000.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_dcf7000.c; then echo $(srcdir)/clk_dcf7000.c; else echo clk_dcf7000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_hopf6021_.c: clk_hopf6021.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_hopf6021.c; then echo $(srcdir)/clk_hopf6021.c; else echo clk_hopf6021.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_meinberg_.c: clk_meinberg.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_meinberg.c; then echo $(srcdir)/clk_meinberg.c; else echo clk_meinberg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_rawdcf_.c: clk_rawdcf.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_rawdcf.c; then echo $(srcdir)/clk_rawdcf.c; else echo clk_rawdcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_rcc8000_.c: clk_rcc8000.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_rcc8000.c; then echo $(srcdir)/clk_rcc8000.c; else echo clk_rcc8000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_schmid_.c: clk_schmid.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_schmid.c; then echo $(srcdir)/clk_schmid.c; else echo clk_schmid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_trimtaip_.c: clk_trimtaip.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_trimtaip.c; then echo $(srcdir)/clk_trimtaip.c; else echo clk_trimtaip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_trimtsip_.c: clk_trimtsip.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_trimtsip.c; then echo $(srcdir)/clk_trimtsip.c; else echo clk_trimtsip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_varitext_.c: clk_varitext.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_varitext.c; then echo $(srcdir)/clk_varitext.c; else echo clk_varitext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-clk_wharton_.c: clk_wharton.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_wharton.c; then echo $(srcdir)/clk_wharton.c; else echo clk_wharton.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-data_mbg_.c: data_mbg.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/data_mbg.c; then echo $(srcdir)/data_mbg.c; else echo data_mbg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-gpstolfp_.c: gpstolfp.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gpstolfp.c; then echo $(srcdir)/gpstolfp.c; else echo gpstolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-ieee754io_.c: ieee754io.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ieee754io.c; then echo $(srcdir)/ieee754io.c; else echo ieee754io.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-info_trimble_.c: info_trimble.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/info_trimble.c; then echo $(srcdir)/info_trimble.c; else echo info_trimble.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-mfp_mul_.c: mfp_mul.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfp_mul.c; then echo $(srcdir)/mfp_mul.c; else echo mfp_mul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-parse_.c: parse.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parse.c; then echo $(srcdir)/parse.c; else echo parse.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-parse_conf_.c: parse_conf.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parse_conf.c; then echo $(srcdir)/parse_conf.c; else echo parse_conf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-parsesolaris_.c: parsesolaris.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parsesolaris.c; then echo $(srcdir)/parsesolaris.c; else echo parsesolaris.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-parsestreams_.c: parsestreams.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parsestreams.c; then echo $(srcdir)/parsestreams.c; else echo parsestreams.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-trim_info_.c: trim_info.c $(ANSI2KNR)
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/trim_info.c; then echo $(srcdir)/trim_info.c; else echo trim_info.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-binio_.$(OBJEXT) binio_.lo clk_computime_.$(OBJEXT) clk_computime_.lo \
-clk_dcf7000_.$(OBJEXT) clk_dcf7000_.lo clk_hopf6021_.$(OBJEXT) \
-clk_hopf6021_.lo clk_meinberg_.$(OBJEXT) clk_meinberg_.lo \
-clk_rawdcf_.$(OBJEXT) clk_rawdcf_.lo clk_rcc8000_.$(OBJEXT) \
-clk_rcc8000_.lo clk_schmid_.$(OBJEXT) clk_schmid_.lo \
-clk_trimtaip_.$(OBJEXT) clk_trimtaip_.lo clk_trimtsip_.$(OBJEXT) \
-clk_trimtsip_.lo clk_varitext_.$(OBJEXT) clk_varitext_.lo \
-clk_wharton_.$(OBJEXT) clk_wharton_.lo data_mbg_.$(OBJEXT) \
-data_mbg_.lo gpstolfp_.$(OBJEXT) gpstolfp_.lo ieee754io_.$(OBJEXT) \
-ieee754io_.lo info_trimble_.$(OBJEXT) info_trimble_.lo \
-mfp_mul_.$(OBJEXT) mfp_mul_.lo parse_.$(OBJEXT) parse_.lo \
-parse_conf_.$(OBJEXT) parse_conf_.lo parsesolaris_.$(OBJEXT) \
-parsesolaris_.lo parsestreams_.$(OBJEXT) parsestreams_.lo \
-trim_info_.$(OBJEXT) trim_info_.lo : $(ANSI2KNR)
mostlyclean-libtool:
-rm -f *.lo
@@ -550,10 +524,12 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LIBRARIES) $(PROGRAMS)
installdirs:
-install: install-am
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -579,6 +555,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
@@ -637,7 +614,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr \
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
pdf: pdf-am
@@ -650,7 +627,7 @@ ps-am:
uninstall-am:
-.MAKE: ../util/ansi2knr install-am install-strip
+.MAKE: all check install install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \
@@ -663,17 +640,17 @@ uninstall-am:
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-kr mostlyclean-libtool pdf \
- pdf-am ps ps-am tags uninstall uninstall-am
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am
#
# create info_trimble.c
#
info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
- @rm -f info_trimble.c
- sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h > info_trimble.c || rm -f info_trimble.c
- sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.c || rm -f info_trimble.c
+ @rm -f $@
+ sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h > $@ || rm -f $@
+ sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> $@ || rm -f $@
kieee754io.o: ieee754io.c
$(COMPILE) $(K_CFLAGS) -c $(srcdir)/ieee754io.c -o $@
@@ -779,6 +756,70 @@ parsesolaris.o: sys/systm.h
sys/systm.h:
mkdir sys && \
sed -e '/ffs(.*)/d' < /usr/include/sys/systm.h > sys/systm.h
+$(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
+ @[ -f $@ ] || \
+ cp $(top_srcdir)/deps-ver $@
+ @[ -w $@ ] || \
+ chmod ug+w $@
+ @cmp $(top_srcdir)/deps-ver $@ > /dev/null || ( \
+ $(MAKE) clean && \
+ echo -n "Prior $(subdir)/$(DEPDIR) version " && \
+ cat $@ && \
+ rm -rf $(DEPDIR) && \
+ mkdir $(DEPDIR) && \
+ case "$(top_builddir)" in \
+ .) \
+ ./config.status Makefile depfiles \
+ ;; \
+ ..) \
+ cd .. && \
+ ./config.status $(subdir)/Makefile depfiles && \
+ cd $(subdir) \
+ ;; \
+ *) \
+ echo 'Fatal: depsver.mf Automake fragment limited' \
+ 'to immediate subdirectories.' && \
+ echo "top_builddir: $(top_builddir)" && \
+ echo "subdir: $(subdir)" && \
+ exit 1 \
+ ;; \
+ esac && \
+ echo -n "Cleaned $(subdir)/$(DEPDIR) version " && \
+ cat $(top_srcdir)/deps-ver \
+ )
+ cp $(top_srcdir)/deps-ver $@
+
+.deps-ver: $(top_srcdir)/deps-ver
+ @[ ! -d $(DEPDIR) ] || $(MAKE) $(DEPDIR)/deps-ver
+ @touch $@
+
+#
+# depsver.mf included in Makefile.am for directories with .deps
+#
+# When building in the same directory with sources that change over
+# time, such as when tracking using bk, the .deps files can become
+# stale with respect to moved, deleted, or superceded headers. Most
+# commonly, this would exhibit as make reporting a failure to make a
+# header file which is no longer in the location given. To address
+# this issue, we use a deps-ver file which is updated with each change
+# that breaks old .deps files. A copy of deps-ver is made into
+# $(DEPDIR) if not already present. If $(DEPDIR)/deps-ver is present
+# with different contents than deps-ver, we make clean to ensure all
+# .o files built before the incompatible change are rebuilt along with
+# their updated .deps files, then remove $(DEPDIR) and recreate it as
+# empty stubs.
+#
+# It is normal when configured with --disable-dependency-tracking for
+# the DEPDIR to not have been created. For this reason, we use the
+# intermediate target .deps-ver, which invokes make recursively if
+# DEPDIR exists.
+#
+# If you modify depsver.mf, please make the changes to the master
+# copy, the one in sntp is copied by the bootstrap script from it.
+#
+# This comment block follows rather than leads the related code so that
+# it stays with it in the generated Makefile.in and Makefile.
+#
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libparse/clk_computime.c b/libparse/clk_computime.c
index d0db6a9f2476..1068576f88aa 100644
--- a/libparse/clk_computime.c
+++ b/libparse/clk_computime.c
@@ -54,7 +54,7 @@
#include <stdio.h>
#else
#include "sys/parsestreams.h"
-extern void printf P((const char *, ...));
+extern int printf (const char *, ...);
#endif
/*
@@ -88,8 +88,8 @@ static struct format computime_fmt =
0
};
-static u_long cvt_computime P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static unsigned long inp_computime P((parse_t *, unsigned int, timestamp_t *));
+static u_long cvt_computime (unsigned char *, int, struct format *, clocktime_t *, void *);
+static unsigned long inp_computime (parse_t *, unsigned int, timestamp_t *);
clockformat_t clock_computime =
{
diff --git a/libparse/clk_dcf7000.c b/libparse/clk_dcf7000.c
index e48173170202..bfd9a744acb3 100644
--- a/libparse/clk_dcf7000.c
+++ b/libparse/clk_dcf7000.c
@@ -51,7 +51,7 @@
#include <stdio.h>
#else
#include "sys/parsestreams.h"
-extern void printf P((const char *, ...));
+extern int printf (const char *, ...);
#endif
static struct format dcf7000_fmt =
@@ -64,8 +64,8 @@ static struct format dcf7000_fmt =
(const unsigned char *)" - - - - - - - \r",
0
};
-static u_long cvt_dcf7000 P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static unsigned long inp_dcf7000 P((parse_t *, unsigned int, timestamp_t *));
+static u_long cvt_dcf7000 (unsigned char *, int, struct format *, clocktime_t *, void *);
+static unsigned long inp_dcf7000 (parse_t *, unsigned int, timestamp_t *);
clockformat_t clock_dcf7000 =
{
diff --git a/libparse/clk_hopf6021.c b/libparse/clk_hopf6021.c
index 426ea48b3aee..033d2d2ca4e7 100644
--- a/libparse/clk_hopf6021.c
+++ b/libparse/clk_hopf6021.c
@@ -34,7 +34,7 @@
#include <stdio.h>
#else
#include "sys/parsestreams.h"
-extern void printf P((const char *, ...));
+extern int printf (const char *, ...);
#endif
/*
@@ -118,8 +118,8 @@ static struct format hopf6021_fmt =
('A' <= (x) && (x) <= 'F') ? (x) - 'A' + 10 : \
-1)
-static unsigned long cvt_hopf6021 P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static unsigned long inp_hopf6021 P((parse_t *, unsigned int, timestamp_t *));
+static unsigned long cvt_hopf6021 (unsigned char *, int, struct format *, clocktime_t *, void *);
+static unsigned long inp_hopf6021 (parse_t *, unsigned int, timestamp_t *);
clockformat_t clock_hopf6021 =
{
diff --git a/libparse/clk_meinberg.c b/libparse/clk_meinberg.c
index 90bb8865d76b..bc0ac0e8170a 100644
--- a/libparse/clk_meinberg.c
+++ b/libparse/clk_meinberg.c
@@ -209,10 +209,10 @@ static struct format meinberg_fmt[] =
}
};
-static u_long cvt_meinberg P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static u_long cvt_mgps P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static u_long mbg_input P((parse_t *, unsigned int, timestamp_t *));
-static u_long gps_input P((parse_t *, unsigned int, timestamp_t *));
+static u_long cvt_meinberg (unsigned char *, int, struct format *, clocktime_t *, void *);
+static u_long cvt_mgps (unsigned char *, int, struct format *, clocktime_t *, void *);
+static u_long mbg_input (parse_t *, unsigned int, timestamp_t *);
+static u_long gps_input (parse_t *, unsigned int, timestamp_t *);
struct msg_buf
{
diff --git a/libparse/clk_rawdcf.c b/libparse/clk_rawdcf.c
index 3ef36c43ea37..20b3bf281b73 100644
--- a/libparse/clk_rawdcf.c
+++ b/libparse/clk_rawdcf.c
@@ -101,9 +101,9 @@
* 59 - usually missing (minute indication), except for leap insertion
*/
-static u_long pps_rawdcf P((parse_t *, int, timestamp_t *));
-static u_long cvt_rawdcf P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static u_long inp_rawdcf P((parse_t *, unsigned int, timestamp_t *));
+static u_long pps_rawdcf (parse_t *, int, timestamp_t *);
+static u_long cvt_rawdcf (unsigned char *, int, struct format *, clocktime_t *, void *);
+static u_long inp_rawdcf (parse_t *, unsigned int, timestamp_t *);
typedef struct last_tcode {
time_t tcode; /* last converted time code */
diff --git a/libparse/clk_rcc8000.c b/libparse/clk_rcc8000.c
index 9ce270d43003..6dca1660d445 100644
--- a/libparse/clk_rcc8000.c
+++ b/libparse/clk_rcc8000.c
@@ -30,7 +30,7 @@
#include <stdio.h>
#else
#include "sys/parsestreams.h"
-extern void printf P((const char *, ...));
+extern int printf (const char *, ...);
#endif
/* Type II Serial Output format
@@ -57,8 +57,8 @@ static struct format rcc8000_fmt =
0
};
-static unsigned long cvt_rcc8000 P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static unsigned long inp_rcc8000 P((parse_t *, unsigned int, timestamp_t *));
+static unsigned long cvt_rcc8000 (unsigned char *, int, struct format *, clocktime_t *, void *);
+static unsigned long inp_rcc8000 (parse_t *, unsigned int, timestamp_t *);
clockformat_t clock_rcc8000 =
{
diff --git a/libparse/clk_schmid.c b/libparse/clk_schmid.c
index 4f4820147dcd..045f0fcf5a8f 100644
--- a/libparse/clk_schmid.c
+++ b/libparse/clk_schmid.c
@@ -52,7 +52,7 @@
#include <stdio.h>
#else
#include "sys/parsestreams.h"
-extern void printf P((const char *, ...));
+extern int printf (const char *, ...);
#endif
/*
@@ -89,8 +89,8 @@ extern void printf P((const char *, ...));
#define WS_MEST 0x04
#define WS_LEAP 0x10
-static u_long cvt_schmid P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static unsigned long inp_schmid P((parse_t *, unsigned int, timestamp_t *));
+static u_long cvt_schmid (unsigned char *, int, struct format *, clocktime_t *, void *);
+static unsigned long inp_schmid (parse_t *, unsigned int, timestamp_t *);
clockformat_t clock_schmid =
{
diff --git a/libparse/clk_trimtaip.c b/libparse/clk_trimtaip.c
index 67db47144040..322d0fa08e89 100644
--- a/libparse/clk_trimtaip.c
+++ b/libparse/clk_trimtaip.c
@@ -51,7 +51,7 @@
#include <stdio.h>
#else
#include "sys/parsestreams.h"
-extern void printf P((const char *, ...));
+extern int printf (const char *, ...);
#endif
/* 0000000000111111111122222222223333333 / char
@@ -78,8 +78,8 @@ extern void printf P((const char *, ...));
0
};
-static unsigned long cvt_trimtaip P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static unsigned long inp_trimtaip P((parse_t *, unsigned int, timestamp_t *));
+static unsigned long cvt_trimtaip (unsigned char *, int, struct format *, clocktime_t *, void *);
+static unsigned long inp_trimtaip (parse_t *, unsigned int, timestamp_t *);
clockformat_t clock_trimtaip =
{
diff --git a/libparse/clk_trimtsip.c b/libparse/clk_trimtsip.c
index be97b74f07e1..58b0f87e3503 100644
--- a/libparse/clk_trimtsip.c
+++ b/libparse/clk_trimtsip.c
@@ -1,12 +1,12 @@
/*
- * /src/NTP/ntp4-dev/libparse/clk_trimtsip.c,v 4.17 2005/04/16 17:32:10 kardel RELEASE_20050508_A
+ * /src/NTP/REPOSITORY/ntp4-dev/libparse/clk_trimtsip.c,v 4.19 2009/11/01 10:47:49 kardel RELEASE_20091101_A
*
- * clk_trimtsip.c,v 4.17 2005/04/16 17:32:10 kardel RELEASE_20050508_A
+ * clk_trimtsip.c,v 4.19 2009/11/01 10:47:49 kardel RELEASE_20091101_A
*
* Trimble TSIP support
* Thanks to Sven Dietrich for providing test hardware
*
- * Copyright (c) 1995-2005 by Frank Kardel <kardel <AT> ntp.org>
+ * Copyright (c) 1995-2009 by Frank Kardel <kardel <AT> ntp.org>
* Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universität Erlangen-Nürnberg, Germany
*
* Redistribution and use in source and binary forms, with or without
@@ -116,8 +116,8 @@ struct trimble
#define STATUS_UNSAFE 1 /* not enough receivers for full precision */
#define STATUS_SYNC 2 /* enough information for good operation */
-static unsigned long inp_tsip P((parse_t *, unsigned int, timestamp_t *));
-static unsigned long cvt_trimtsip P((unsigned char *, int, struct format *, clocktime_t *, void *));
+static unsigned long inp_tsip (parse_t *, unsigned int, timestamp_t *);
+static unsigned long cvt_trimtsip (unsigned char *, int, struct format *, clocktime_t *, void *);
struct clockformat clock_trimtsip =
{
@@ -190,6 +190,7 @@ inp_tsip(
t->t_in_pkt = t->t_dle = 0;
return PARSE_INP_TIME|PARSE_INP_DATA;
}
+ /*FALLTHROUGH*/
default: /* collect data */
t->t_dle = 0;
@@ -398,6 +399,12 @@ int clk_trimtsip_bs;
* History:
*
* clk_trimtsip.c,v
+ * Revision 4.19 2009/11/01 10:47:49 kardel
+ * de-P()
+ *
+ * Revision 4.18 2009/11/01 08:46:46 kardel
+ * clarify case FALLTHROUGH
+ *
* Revision 4.17 2005/04/16 17:32:10 kardel
* update copyright
*
diff --git a/libparse/clk_varitext.c b/libparse/clk_varitext.c
index 01b8719854cb..295ce0af7589 100644
--- a/libparse/clk_varitext.c
+++ b/libparse/clk_varitext.c
@@ -55,7 +55,7 @@
# include <stdio.h>
#else
# include "sys/parsestreams.h"
-extern void printf P((const char *, ...));
+extern int printf (const char *, ...);
#endif
static const u_char VT_INITIALISED = 0x01;
@@ -105,8 +105,8 @@ static struct format varitext_fmt =
0
};
-static u_long cvt_varitext P((unsigned char *, int, struct format *, clocktime_t *, void *));
-static u_long inp_varitext P((parse_t *, unsigned int, timestamp_t *));
+static u_long cvt_varitext (unsigned char *, int, struct format *, clocktime_t *, void *);
+static u_long inp_varitext (parse_t *, unsigned int, timestamp_t *);
struct varitext {
unsigned char start_found;
diff --git a/libparse/clk_wharton.c b/libparse/clk_wharton.c
index b4332fbcd714..0a1ee0b03a47 100644
--- a/libparse/clk_wharton.c
+++ b/libparse/clk_wharton.c
@@ -30,7 +30,7 @@
#include <stdio.h>
#else
#include "sys/parsestreams.h"
-extern void printf P((const char *, ...));
+extern void printf (const char *, ...);
#endif
/*
diff --git a/libparse/data_mbg.c b/libparse/data_mbg.c
index 9b6f1aae28ec..991f1e90e2b4 100644
--- a/libparse/data_mbg.c
+++ b/libparse/data_mbg.c
@@ -46,8 +46,8 @@
#include "binio.h"
#include "ieee754io.h"
-static void get_mbg_tzname P((unsigned char **, char *));
-static void mbg_time_status_str P((char **, unsigned int, int));
+static void get_mbg_tzname (unsigned char **, char *);
+static void mbg_time_status_str (char **, unsigned int, int);
#if 0 /* no actual floats on Meinberg binary interface */
static offsets_t mbg_float = { 1, 0, 3, 2, 0, 0, 0, 0 }; /* byte order for meinberg floats */
diff --git a/libparse/gpstolfp.c b/libparse/gpstolfp.c
index fd7be31241b4..9f1a9bfd601d 100644
--- a/libparse/gpstolfp.c
+++ b/libparse/gpstolfp.c
@@ -34,7 +34,7 @@
*/
#include "ntp_fp.h"
-#define GPSORIGIN ULONG_CONST(2524953600) /* NTP origin - GPS origin in seconds */
+#define GPSORIGIN 2524953600UL /* NTP origin - GPS origin in seconds */
#define SECSPERWEEK (unsigned)(604800) /* seconds per week - GPS tells us about weeks */
#define GPSWRAP 990 /* assume week count less than this in the previous epoch */
diff --git a/libparse/ieee754io.c b/libparse/ieee754io.c
index 27c65255ea3e..1c203d7bcdde 100644
--- a/libparse/ieee754io.c
+++ b/libparse/ieee754io.c
@@ -43,9 +43,9 @@
#include "ntp_fp.h"
#include "ieee754io.h"
-static unsigned char get_byte P((unsigned char *, offsets_t, int *));
+static unsigned char get_byte (unsigned char *, offsets_t, int *);
#ifdef __not_yet__
-static void put_byte P((unsigned char *, offsets_t, int *, unsigned char));
+static void put_byte (unsigned char *, offsets_t, int *, unsigned char);
#endif
#ifdef LIBDEBUG
diff --git a/libparse/parse.c b/libparse/parse.c
index dfbbaa608504..83e560aff0c6 100644
--- a/libparse/parse.c
+++ b/libparse/parse.c
@@ -68,7 +68,7 @@ static char rcsid[] = "parse.c,v 4.20 2005/08/06 17:39:40 kardel RELEASE_2005080
extern clockformat_t *clockformats[];
extern unsigned short nformats;
-static u_long timepacket P((parse_t *));
+static u_long timepacket (parse_t *);
/*
* strings support usually not in kernel - duplicated, but what the heck
@@ -234,7 +234,7 @@ parse_addchar(
* collect into buffer
*/
parseprintf(DD_PARSE, ("parse: parse_addchar: buffer[%d] = 0x%x\n", parseio->parse_index, ch));
- parseio->parse_data[parseio->parse_index++] = ch;
+ parseio->parse_data[parseio->parse_index++] = (char)ch;
return PARSE_INP_SKIP;
}
else
diff --git a/libparse/parsesolaris.c b/libparse/parsesolaris.c
index c023ad84aaa5..2d499f0f68ce 100644
--- a/libparse/parsesolaris.c
+++ b/libparse/parsesolaris.c
@@ -173,11 +173,11 @@ _fini(
/*--------------- stream module definition ----------------------------*/
-static int parseopen P((queue_t *, dev_t *, int, int, cred_t *));
-static int parseclose P((queue_t *, int));
-static int parsewput P((queue_t *, mblk_t *));
-static int parserput P((queue_t *, mblk_t *));
-static int parsersvc P((queue_t *));
+static int parseopen (queue_t *, dev_t *, int, int, cred_t *);
+static int parseclose (queue_t *, int);
+static int parsewput (queue_t *, mblk_t *);
+static int parserput (queue_t *, mblk_t *);
+static int parsersvc (queue_t *);
static struct module_info driverinfo =
{
@@ -244,8 +244,8 @@ int parsedebug = 0;
}\
} while (0)
-static int init_linemon P((queue_t *));
-static void close_linemon P((queue_t *, queue_t *));
+static int init_linemon (queue_t *);
+static void close_linemon (queue_t *, queue_t *);
#define M_PARSE 0x0001
#define M_NOPARSE 0x0002
@@ -264,7 +264,7 @@ ntp_memset(
static void
pprintf(
int lev,
- const char *form,
+ char *form,
...
)
{
@@ -273,7 +273,7 @@ pprintf(
va_start(ap, form);
if (lev & parsedebug)
- vcmn_err(CE_CONT, (char *)form, ap);
+ vcmn_err(CE_CONT, form, ap);
va_end(ap);
}
@@ -641,15 +641,15 @@ parserput(
register parsestream_t * parse = (parsestream_t *)q->q_ptr;
register mblk_t *nmp;
register unsigned long ch;
- timestamp_t ctime;
+ timestamp_t c_time;
timespec_t hres_time;
/*
* get time on packet delivery
*/
gethrestime(&hres_time);
- ctime.tv.tv_sec = hres_time.tv_sec;
- ctime.tv.tv_usec = hres_time.tv_nsec / 1000;
+ c_time.tv.tv_sec = hres_time.tv_sec;
+ c_time.tv.tv_usec = hres_time.tv_nsec / 1000;
if (!(parse->parse_status & PARSE_ENABLE))
{
@@ -672,7 +672,7 @@ parserput(
while (mp != (mblk_t *)NULL)
{
ch = rdchar(&mp);
- if (ch != ~0 && parse_ioread(&parse->parse_io, (unsigned int)ch, &ctime))
+ if (ch != ~0 && parse_ioread(&parse->parse_io, (unsigned int)ch, &c_time))
{
/*
* up up and away (hopefully ...)
@@ -693,7 +693,7 @@ parserput(
}
else
{
- if (parse_ioread(&parse->parse_io, (unsigned int)0, &ctime))
+ if (parse_ioread(&parse->parse_io, (unsigned int)0, &c_time))
{
/*
* up up and away (hopefully ...)
@@ -723,19 +723,19 @@ parserput(
case M_UNHANGUP:
{
register parsestream_t * parse = (parsestream_t *)q->q_ptr;
- timestamp_t ctime;
+ timestamp_t c_time;
timespec_t hres_time;
register mblk_t *nmp;
register int status = cd_invert ^ (type == M_UNHANGUP);
gethrestime(&hres_time);
- ctime.tv.tv_sec = hres_time.tv_sec;
- ctime.tv.tv_usec = hres_time.tv_nsec / 1000;
+ c_time.tv.tv_sec = hres_time.tv_sec;
+ c_time.tv.tv_usec = hres_time.tv_nsec / 1000;
pprintf(DD_RPUT, "parse: parserput - M_%sHANGUP\n", (type == M_HANGUP) ? "" : "UN");
if ((parse->parse_status & PARSE_ENABLE) &&
- parse_iopps(&parse->parse_io, status ? SYNC_ONE : SYNC_ZERO, &ctime))
+ parse_iopps(&parse->parse_io, status ? SYNC_ONE : SYNC_ZERO, &c_time))
{
nmp = (mblk_t *)NULL;
if (canputnext(parse->parse_queue) && (nmp = allocb(sizeof(parsetime_t), BPRI_MED)))
@@ -759,7 +759,7 @@ parserput(
if (status)
{
- parse->parse_ppsclockev.tv = ctime.tv;
+ parse->parse_ppsclockev.tv = c_time.tv;
++(parse->parse_ppsclockev.serial);
}
}
@@ -767,8 +767,8 @@ parserput(
return 0;
}
-static int init_zs_linemon P((queue_t *, queue_t *)); /* handle line monitor for "zs" driver */
-static void close_zs_linemon P((queue_t *, queue_t *));
+static int init_zs_linemon (queue_t *, queue_t *); /* handle line monitor for "zs" driver */
+static void close_zs_linemon (queue_t *, queue_t *);
/*-------------------- CD isr status monitor ---------------*/
@@ -849,7 +849,7 @@ close_linemon(
#include <sys/ser_async.h>
#include <sys/ser_zscc.h>
-static void zs_xsisr P((struct zscom *)); /* zs external status interupt handler */
+static void zs_xsisr (struct zscom *); /* zs external status interupt handler */
/*
* there should be some docs telling how to get to
@@ -911,7 +911,7 @@ init_zs_linemon(
parsestream->parse_dqueue = q; /* remember driver */
szs->zsops = *zs->zs_ops;
- szs->zsops.zsop_xsint = (void (*) P((struct zscom *)))zs_xsisr; /* place our bastard */
+ szs->zsops.zsop_xsint = (void (*) (struct zscom *))zs_xsisr; /* place our bastard */
szs->oldzsops = zs->zs_ops;
emergencyzs = zs->zs_ops;
@@ -920,7 +920,7 @@ init_zs_linemon(
* XXX: this is usually done via zsopinit()
* - have yet to find a way to call that routine
*/
- zs->zs_xsint = (void (*) P((struct zscom *)))zs_xsisr;
+ zs->zs_xsint = (void (*) (struct zscom *))zs_xsisr;
mutex_exit(zs->zs_excl);
@@ -1117,7 +1117,7 @@ zs_xsisr(
dname = q->q_qinfo->qi_minfo->mi_idname;
if (!strcmp(dname, parseinfo.st_rdinit->qi_minfo->mi_idname))
{
- register void (*zsisr) P((struct zscom *));
+ register void (*zsisr) (struct zscom *);
/*
* back home - phew (hopping along stream queues might
diff --git a/libparse/parsestreams.c b/libparse/parsestreams.c
index 7df354292283..3fb4cc3511aa 100644
--- a/libparse/parsestreams.c
+++ b/libparse/parsestreams.c
@@ -77,15 +77,15 @@ static char rcsid[] = "parsestreams.c,v 4.11 2005/04/16 17:32:10 kardel RELEASE_
/*
* just make checking compilers more silent
*/
-extern int printf P((const char *, ...));
-extern int putctl1 P((queue_t *, int, int));
-extern int canput P((queue_t *));
-extern void putbq P((queue_t *, mblk_t *));
-extern void freeb P((mblk_t *));
-extern void qreply P((queue_t *, mblk_t *));
-extern void freemsg P((mblk_t *));
-extern void panic P((const char *, ...));
-extern void usec_delay P((int));
+extern int printf (const char *, ...);
+extern int putctl1 (queue_t *, int, int);
+extern int canput (queue_t *);
+extern void putbq (queue_t *, mblk_t *);
+extern void freeb (mblk_t *);
+extern void qreply (queue_t *, mblk_t *);
+extern void freemsg (mblk_t *);
+extern void panic (const char *, ...);
+extern void usec_delay (int);
#include "parse.h"
#include "sys/parsestreams.h"
@@ -357,11 +357,11 @@ xxxinit(
/*--------------- stream module definition ----------------------------*/
-static int parseopen P((queue_t *, dev_t, int, int));
-static int parseclose P((queue_t *, int));
-static int parsewput P((queue_t *, mblk_t *));
-static int parserput P((queue_t *, mblk_t *));
-static int parsersvc P((queue_t *));
+static int parseopen (queue_t *, dev_t, int, int);
+static int parseclose (queue_t *, int);
+static int parsewput (queue_t *, mblk_t *);
+static int parserput (queue_t *, mblk_t *);
+static int parsersvc (queue_t *);
static char mn[] = "parse";
@@ -416,7 +416,7 @@ int cd_invert = 1; /* invert status of CD line - PPS support via CD input */
int parsedebug = ~0;
-extern void uniqtime P((struct timeval *));
+extern void uniqtime (struct timeval *);
/*--------------- module implementation -----------------------------*/
@@ -429,8 +429,8 @@ extern void uniqtime P((struct timeval *));
}\
} while (0)
-static int init_linemon P((queue_t *));
-static void close_linemon P((queue_t *, queue_t *));
+static int init_linemon (queue_t *);
+static void close_linemon (queue_t *, queue_t *);
#define M_PARSE 0x0001
#define M_NOPARSE 0x0002
@@ -919,8 +919,8 @@ parserput(
return 0;
}
-static int init_zs_linemon P((queue_t *, queue_t *)); /* handle line monitor for "zs" driver */
-static void close_zs_linemon P((queue_t *, queue_t *));
+static int init_zs_linemon (queue_t *, queue_t *); /* handle line monitor for "zs" driver */
+static void close_zs_linemon (queue_t *, queue_t *);
/*-------------------- CD isr status monitor ---------------*/
@@ -1010,8 +1010,8 @@ struct savedzsops
};
struct zsops *emergencyzs;
-extern void zsopinit P((struct zscom *, struct zsops *));
-static int zs_xsisr P((struct zscom *)); /* zs external status interupt handler */
+extern void zsopinit (struct zscom *, struct zsops *);
+static int zs_xsisr (struct zscom *); /* zs external status interupt handler */
static int
init_zs_linemon(
@@ -1112,7 +1112,7 @@ close_zs_linemon(
#define MAXDEPTH 50 /* maximum allowed stream crawl */
#ifdef PPS_SYNC
-extern void hardpps P((struct timeval *, long));
+extern void hardpps (struct timeval *, long);
#ifdef PPS_NEW
extern struct timeval timestamp;
#else
@@ -1282,7 +1282,7 @@ zs_xsisr(
dname = q->q_qinfo->qi_minfo->mi_idname;
if (!Strcmp(dname, parseinfo.st_rdinit->qi_minfo->mi_idname))
{
- register int (*zsisr) P((struct zscom *));
+ register int (*zsisr) (struct zscom *);
/*
* back home - phew (hopping along stream queues might
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 07:51:04 +0000