From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 29 Dec 2014 06:42:07 +0000 (+0000)
Subject: [Bug 2706] libparse/info_trimble.c build dependencies are broken
X-Git-Tag: NTP_4_2_8P1_BETA3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cb6f3d86a9007dfba5b2073b5e33e9bcd71d7a9;p=thirdparty%2Fntp.git

[Bug 2706] libparse/info_trimble.c build dependencies are broken

bk: 54a0f7bfNEv4-olrI18xcRIEup5Xsw
---

diff --git a/ChangeLog b/ChangeLog
index 9a90f3f1f..e14e94155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 2706] libparse/info_trimble.c build dependencies are broken.
 * [Bug 2713] variable type/cast, parameter name, general cleanup from NetBSD.
 ---
 (4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index a92db1546..2988e08e2 100644
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -1,5 +1,5 @@
 NULL=
-BUILT_SOURCES =
+BUILT_SOURCES = $(VPHACK) info_trimble.c $(VPHACK_AFTER)
 CLEANFILES =
 noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
 EXTRA_LIBRARIES = libparse.a libparse_kernel.a
@@ -12,6 +12,29 @@ K_CFLAGS = -DPARSESTREAM -DNTP_NEED_BOPS
 # previously.  It is located in $(srcdir) and any updates must
 # end up there.
 
+#
+# VPHACK and VPHACK_AFTER are enabled on non-GNU makes (such as
+# BSD make) to work around build/dependency issues where we want
+# built source files to live in srcdir, as opposed to builddir.
+#
+
+if VPATH_HACK
+VPHACK=	vphack
+VPHACK_AFTER= vphack_after
+else
+VPHACK=
+VPHACK_AFTER=
+endif
+
+vphack:
+	test -e info_trimble.c || ln -s $(srcdir)/info_trimble.c .
+
+vphack_after:
+	test -L info_trimble.c || ( \
+		mv info_trimble.c $(srcdir)/info_trimble.c && \
+		ln -s $(srcdir)/info_trimble.c . \
+		)
+
 libparse_a_SOURCES = parse.c \
 		     parse_conf.c \
 		     clk_meinberg.c \
@@ -65,11 +88,16 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
 
-$(srcdir)/info_trimble.c: $(top_srcdir)/include/trimble.h $(srcdir)/Makefile.am $(srcdir)/mkinfo_scmd.sed $(srcdir)/mkinfo_rcmd.sed
+info_trimble.c: $(top_srcdir)/include/trimble.h $(srcdir)/Makefile.am $(srcdir)/mkinfo_scmd.sed $(srcdir)/mkinfo_rcmd.sed
 	sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > info_trimble.new
 	sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.new
 	mv -f info_trimble.new $@
 
+#$(srcdir)/info_trimble.c: $(top_srcdir)/include/trimble.h $(srcdir)/Makefile.am $(srcdir)/mkinfo_scmd.sed $(srcdir)/mkinfo_rcmd.sed
+#	sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > info_trimble.new
+#	sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.new
+#	mv -f info_trimble.new $@
+
 kieee754io.o: $(srcdir)/ieee754io.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/ieee754io.c -o $@
 
diff --git a/libparse/info_trimble.c b/libparse/info_trimble.c
index 6456e0f9f..53b2e32c1 100644
--- a/libparse/info_trimble.c
+++ b/libparse/info_trimble.c
@@ -48,7 +48,7 @@ cmd_info_t trimble_scmds[] = {
 	{ CMD_CHIGH8CNT, "CMD_CHIGH8CNT", "high-8 (best 4) / high-6 (overdetermined) control (0x75)", "", 0 },
 	{ CMD_CMAXDGPSCOR, "CMD_CMAXDGPSCOR", "maximum rate of DGPS corrections (0x77)", "", 0 },
 	{ CMD_CSUPER, "CMD_CSUPER", "super paket (0x8E)", "", 0 },
-	{ 0xFF, "", "" }
+	{ 0xFF, "", "", "", 0 }
 };
 
 
@@ -90,5 +90,5 @@ cmd_info_t trimble_rcmds[] = {
 	{ CMD_RDOUBLELLA, "CMD_RDOUBLELLA", "double precision LLA (0x84)", "gps_position_ext(LLA)", RO|DEF },
 	{ CMD_RDGPSSTAT, "CMD_RDGPSSTAT", "differential correction status (0x85)", "trimble_dgpsstatus", RO },
 	{ CMD_RSUPER, "CMD_RSUPER", "super paket (0x8F)", "", 0 },
-	{ 0xFF, "", "" }
+	{ 0xFF, "", "", "", 0 }
 };
diff --git a/libparse/mkinfo_rcmd.sed b/libparse/mkinfo_rcmd.sed
index 5238d5c4e..b8ed6232e 100644
--- a/libparse/mkinfo_rcmd.sed
+++ b/libparse/mkinfo_rcmd.sed
@@ -4,5 +4,5 @@
 cmd_info_t trimble_rcmds[] = {
 s!^#define[ \	][ \	]*\(CMD_R[^ \	]*\)[ \	][ \	]*\([^ \	]*\)[ \	][ \	]*/\*[ \	][ \	]*\(.*\)[ \	]*:\([^:]*\):\([^:]*\)[ \	][ \	]*\*/!\	{ \1, "\1", "\3 (\2)", "\4", \5 },!p
 $a\
-\	{ 0xFF, "", "" }\
+\	{ 0xFF, "", "", "", 0 }\
 };
diff --git a/libparse/mkinfo_scmd.sed b/libparse/mkinfo_scmd.sed
index 9c17f39ed..fb58d32db 100644
--- a/libparse/mkinfo_scmd.sed
+++ b/libparse/mkinfo_scmd.sed
@@ -11,5 +11,5 @@
 cmd_info_t trimble_scmds[] = {
 s!^#define[ 	][ 	]*\(CMD_C[^ 	]*\)[ 	][ 	]*\([^ 	]*\)[ 	][ 	]*/\*[ 	][ 	]*\(.*\)[ 	][ 	]*\*/!	{ \1, "\1", "\3 (\2)", "", 0 },!p
 $a\
-\	{ 0xFF, "", "" }\
+\	{ 0xFF, "", "", "", 0 }\
 };