Merge commit 'd30f6ae8ea76bc7398f96e9ac76aa5232d8d5e4f'

ChangeLog

@@ -3,6 +3,13 @@
 	* configure.ac: autotools currently defaults to the parallel test
 	harness. So add the serial test option to AM_INIT_AUTOMAKE.
 
+2017-05-15  Sebastien Alaiwan <sebastien.alaiwan@gmail.com>
+
+	* jit/jit-opcodes: include jit/jit-opcode-compat.h instead of
+	jit-opcode-compat.h.
+	* jit/Makefile.am: make path of generated dependencies relative to
+	top_builddir.
+
 2016-11-10  Tomasz Borowik  <timon37@gmail.com>
 	* include/jit/jit-meta.h: include jit-common.h instead of jit-defs.h
 

jit/Makefile.am

@@ -89,11 +89,11 @@ libjit_la_LDFLAGS = -version-info $(LIBJIT_VERSION) -no-undefined
 
 jit-interp.lo: jit-interp-labels.h
 
-jit-interp-labels.h: $(top_srcdir)/include/jit/jit-opcode.h \
+jit-interp-labels.h: $(top_builddir)/include/jit/jit-opcode.h \
-		$(top_srcdir)/jit/jit-interp-opcode.h $(srcdir)/mklabel.sh
+		$(top_builddir)/jit/jit-interp-opcode.h $(srcdir)/mklabel.sh
 	$(SHELL) $(srcdir)/mklabel.sh "$(AWK)" \
-		$(top_srcdir)/include/jit/jit-opcode.h \
+		$(top_builddir)/include/jit/jit-opcode.h \
-		$(top_srcdir)/jit/jit-interp-opcode.h >jit-interp-labels.h
+		$(top_builddir)/jit/jit-interp-opcode.h >jit-interp-labels.h
 
 jit-rules-x86.lo: jit-rules-x86.inc
 

jit/jit-opcodes.ops

@@ -951,7 +951,7 @@ struct jit_opcode_info
 #endif
 JIT_EXPORT_DATA jit_opcode_info_t const jit_opcodes[JIT_OP_NUM_OPCODES];
 
-#include "jit-opcode-compat.h"
+#include "jit/jit-opcode-compat.h"
 
 #ifdef	__cplusplus
 };