From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 16 Feb 2000 00:52:08 +0000 (-0000)
Subject: ChangeLog, Makefile.am, Makefile.in, clk_trimtsip.c, parse.c:
X-Git-Tag: NTP_4_0_99_F~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f859652613482b862a34b1fbdd06f786a4da13e;p=thirdparty%2Fntp.git

ChangeLog, Makefile.am, Makefile.in, clk_trimtsip.c, parse.c:
  * libparse/Makefile.am (K_CFLAGS): Use instead.  Add NEED_NTP_BOPS.

bk: 38a9f4b8bLbn9kr0WYEIQ52KGTTRvA
---

diff --git a/ChangeLog b/ChangeLog
index edb622234..210abee92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-15  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+	* libparse/Makefile.am (K_CFLAGS): Use instead.  Add NEED_NTP_BOPS.
+
 2000-02-10  Harlan Stenn  <stenn@whimsy.udel.edu>
 
 	* scripts/ntp-wait.in: Intensify, including some suggestions from
diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index 93a5a64ab..dfb3a550b 100644
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -6,6 +6,8 @@ EXTRA_PROGRAMS = parsestreams parsesolaris
 noinst_PROGRAMS = @MAKE_PARSEKMODULE@
 CLEANFILES = libparse.a libparse_kernel.a
 
+K_CFLAGS = -DPARSESTREAM -DNTP_NEED_BOPS
+
 libparse_a_SOURCES = parse.c \
                      parse_conf.c \
                      clk_meinberg.c \
@@ -52,82 +54,82 @@ info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
 	sed -n -f mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.c || rm -f info_trimble.c
 
 kclk_computime.o: clk_computime.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_computime.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_computime.c -o $@
 
 kclk_computime_.o: clk_computime_.c
-	$(COMPILE) -DPARSESTREAM -c clk_computime_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_computime_.c -o $@
 
 kclk_dcf7000.o: clk_dcf7000.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_dcf7000.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_dcf7000.c -o $@
 
 kclk_dcf7000_.o: clk_dcf7000_.c
-	$(COMPILE) -DPARSESTREAM -c clk_dcf7000_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_dcf7000_.c -o $@
 
 kclk_hopf6021.o: clk_hopf6021.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_hopf6021.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_hopf6021.c -o $@
 
 kclk_hopf6021_.o: clk_hopf6021_.c
-	$(COMPILE) -DPARSESTREAM -c clk_hopf6021_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_hopf6021_.c -o $@
 
 kclk_meinberg.o: clk_meinberg.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_meinberg.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_meinberg.c -o $@
 
 kclk_meinberg_.o: clk_meinberg_.c
-	$(COMPILE) -DPARSESTREAM -c clk_meinberg_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_meinberg_.c -o $@
 
 kclk_rawdcf.o: clk_rawdcf.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_rawdcf.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_rawdcf.c -o $@
 
 kclk_rawdcf_.o: clk_rawdcf_.c
-	$(COMPILE) -DPARSESTREAM -c clk_rawdcf_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_rawdcf_.c -o $@
 
 kclk_rcc8000.o: clk_rcc8000.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_rcc8000.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_rcc8000.c -o $@
 
 kclk_rcc8000_.o: clk_rcc8000_.c
-	$(COMPILE) -DPARSESTREAM -c clk_rcc8000_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_rcc8000_.c -o $@
 
 kclk_schmid.o: clk_schmid.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_schmid.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_schmid.c -o $@
 
 kclk_schmid_.o: clk_schmid_.c
-	$(COMPILE) -DPARSESTREAM -c clk_schmid_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_schmid_.c -o $@
 
 kclk_trimtaip.o: clk_trimtaip.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_trimtaip.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_trimtaip.c -o $@
 
 kclk_trimtaip_.o: clk_trimtaip_.c
-	$(COMPILE) -DPARSESTREAM -c clk_trimtaip_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_trimtaip_.c -o $@
 
 kclk_trimtsip.o: clk_trimtsip.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_trimtsip.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_trimtsip.c -o $@
 
 kclk_trimtsip_.o: clk_trimtsip_.c
-	$(COMPILE) -DPARSESTREAM -c clk_trimtsip_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_trimtsip_.c -o $@
 
 kclk_varitext.o: clk_varitext.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_varitext.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_varitext.c -o $@
 
 kclk_varitext_.o: clk_varitext_.c
-	$(COMPILE) -DPARSESTREAM -c clk_varitext_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_varitext_.c -o $@
 
 kclk_wharton.o: clk_wharton.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_wharton.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_wharton.c -o $@
 
 kclk_wharton_.o: clk_wharton_.c
-	$(COMPILE) -DPARSESTREAM -c clk_wharton_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_wharton_.c -o $@
 
 kparse.o: parse.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/parse.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse.c -o $@
 
 kparse_.o: parse_.c
-	$(COMPILE) -DPARSESTREAM -c parse_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c parse_.c -o $@
 
 kparse_conf.o: parse_conf.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/parse_conf.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse_conf.c -o $@
 
 kparse_conf_.o: parse_conf_.c
-	$(COMPILE) -DPARSESTREAM -c parse_conf_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -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 d7dde9d1b..8331a908d 100644
--- a/libparse/Makefile.in
+++ b/libparse/Makefile.in
@@ -109,6 +109,8 @@ EXTRA_PROGRAMS = parsestreams parsesolaris
 noinst_PROGRAMS = @MAKE_PARSEKMODULE@
 CLEANFILES = libparse.a libparse_kernel.a
 
+K_CFLAGS = -DPARSESTREAM -DNTP_NEED_BOPS
+
 libparse_a_SOURCES = parse.c \
                      parse_conf.c \
                      clk_meinberg.c \
@@ -496,82 +498,82 @@ info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
 	sed -n -f mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.c || rm -f info_trimble.c
 
 kclk_computime.o: clk_computime.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_computime.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_computime.c -o $@
 
 kclk_computime_.o: clk_computime_.c
-	$(COMPILE) -DPARSESTREAM -c clk_computime_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_computime_.c -o $@
 
 kclk_dcf7000.o: clk_dcf7000.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_dcf7000.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_dcf7000.c -o $@
 
 kclk_dcf7000_.o: clk_dcf7000_.c
-	$(COMPILE) -DPARSESTREAM -c clk_dcf7000_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_dcf7000_.c -o $@
 
 kclk_hopf6021.o: clk_hopf6021.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_hopf6021.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_hopf6021.c -o $@
 
 kclk_hopf6021_.o: clk_hopf6021_.c
-	$(COMPILE) -DPARSESTREAM -c clk_hopf6021_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_hopf6021_.c -o $@
 
 kclk_meinberg.o: clk_meinberg.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_meinberg.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_meinberg.c -o $@
 
 kclk_meinberg_.o: clk_meinberg_.c
-	$(COMPILE) -DPARSESTREAM -c clk_meinberg_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_meinberg_.c -o $@
 
 kclk_rawdcf.o: clk_rawdcf.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_rawdcf.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_rawdcf.c -o $@
 
 kclk_rawdcf_.o: clk_rawdcf_.c
-	$(COMPILE) -DPARSESTREAM -c clk_rawdcf_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_rawdcf_.c -o $@
 
 kclk_rcc8000.o: clk_rcc8000.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_rcc8000.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_rcc8000.c -o $@
 
 kclk_rcc8000_.o: clk_rcc8000_.c
-	$(COMPILE) -DPARSESTREAM -c clk_rcc8000_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_rcc8000_.c -o $@
 
 kclk_schmid.o: clk_schmid.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_schmid.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_schmid.c -o $@
 
 kclk_schmid_.o: clk_schmid_.c
-	$(COMPILE) -DPARSESTREAM -c clk_schmid_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_schmid_.c -o $@
 
 kclk_trimtaip.o: clk_trimtaip.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_trimtaip.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_trimtaip.c -o $@
 
 kclk_trimtaip_.o: clk_trimtaip_.c
-	$(COMPILE) -DPARSESTREAM -c clk_trimtaip_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_trimtaip_.c -o $@
 
 kclk_trimtsip.o: clk_trimtsip.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_trimtsip.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_trimtsip.c -o $@
 
 kclk_trimtsip_.o: clk_trimtsip_.c
-	$(COMPILE) -DPARSESTREAM -c clk_trimtsip_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_trimtsip_.c -o $@
 
 kclk_varitext.o: clk_varitext.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_varitext.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_varitext.c -o $@
 
 kclk_varitext_.o: clk_varitext_.c
-	$(COMPILE) -DPARSESTREAM -c clk_varitext_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_varitext_.c -o $@
 
 kclk_wharton.o: clk_wharton.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/clk_wharton.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_wharton.c -o $@
 
 kclk_wharton_.o: clk_wharton_.c
-	$(COMPILE) -DPARSESTREAM -c clk_wharton_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c clk_wharton_.c -o $@
 
 kparse.o: parse.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/parse.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse.c -o $@
 
 kparse_.o: parse_.c
-	$(COMPILE) -DPARSESTREAM -c parse_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c parse_.c -o $@
 
 kparse_conf.o: parse_conf.c
-	$(COMPILE) -DPARSESTREAM -c $(srcdir)/parse_conf.c -o $@
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse_conf.c -o $@
 
 kparse_conf_.o: parse_conf_.c
-	$(COMPILE) -DPARSESTREAM -c parse_conf_.c -o $@
+	$(COMPILE) $(K_CFLAGS) -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/clk_trimtsip.c b/libparse/clk_trimtsip.c
index 54367f849..cbe65f34a 100644
--- a/libparse/clk_trimtsip.c
+++ b/libparse/clk_trimtsip.c
@@ -26,10 +26,10 @@
 #include "parse.h"
 
 #ifndef PARSESTREAM
-#include <stdio.h>
+# include <stdio.h>
 #else
-#include "sys/parsestreams.h"
-# endif
+# include "sys/parsestreams.h"
+#endif
 
 #include "ascii.h"
 #include "binio.h"
diff --git a/libparse/parse.c b/libparse/parse.c
index 869b70f8b..78ff981e5 100644
--- a/libparse/parse.c
+++ b/libparse/parse.c
@@ -43,9 +43,9 @@ static char rcsid[] = "parse.c,v 4.14 1999/11/28 09:13:52 kardel RELEASE_1999112
 #include "parse.h"
 
 #ifndef PARSESTREAM
-#include <stdio.h>
+# include <stdio.h>
 #else
-#include "sys/parsestreams.h"
+# include "sys/parsestreams.h"
 #endif
 
 extern clockformat_t *clockformats[];