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

bk: 54a0f7bfNEv4-olrI18xcRIEup5Xsw

diff --git a/ChangeLog b/ChangeLog
index 9a90f3f1fdd13e0e06785b2b3e30219c0ad24af5..e14e9415592ffc36f371ec1b9ab5b43678050e83 100644 (file)
--- 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 a92db1546cbfdfb791f0254363af1169fc57f9f1..2988e08e2bc22b90b1ad160d1b0a67db08b98768 100644 (file)
--- 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 6456e0f9f7f6b679ed2ca321aade9e41e9384da0..53b2e32c1ac576efc427751a2f6e270937e46e61 100644 (file)
--- 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 5238d5c4eb13db698db6ec8d407b2f41abc24d9f..b8ed6232e615944a7ecf97db803229e7072d4c3e 100644 (file)
--- 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 9c17f39ed703eee70f9da3890f3b7e1c009c981e..fb58d32db5d37c53792f36cb1bad23b8c2339c25 100644 (file)
--- 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 }\
 };