Fix: missing includes break the out-of-tree build

Addresses out-of-tree build breakage introduced by
commit 3842465694945829d76452ff83924aa0103c6293

Reported-by: Nathan Lynch <Nathan_Lynch@mentor.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 0d967000efdf75c7b27ce5b38d5479288a5adc2f..ea11e91d42cdec6e047154ce7ec642f9c670430b 100644 (file)
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -3,7 +3,8 @@ babeltrace.i: babeltrace.i.in
                $(top_srcdir)/bindings/python/babeltrace.i.in > \
                $(top_builddir)/bindings/python/babeltrace.i
 
-AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/
+AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ \
+               -I$(top_srcdir)/bindings/python
 
 EXTRA_DIST = babeltrace.i.in
 nodist_python_PYTHON = babeltrace.py

diff --git a/formats/ctf/Makefile.am b/formats/ctf/Makefile.am
index 094cb36dd5eedb00d4b406d01cb2b4b9d3602c32..2267ce5731fa08f8dca10a7bfd6b8979cac0ba37 100644 (file)
--- a/formats/ctf/Makefile.am
+++ b/formats/ctf/Makefile.am
@@ -1,4 +1,5 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
+               -I$(top_builddir)/formats/ctf
 
 SUBDIRS = types metadata writer .
 

diff --git a/formats/ctf/metadata/Makefile.am b/formats/ctf/metadata/Makefile.am
index 85db70647c3a1595daddbacffe882667376c10eb..1f8e76e3a0e80b9947e79289837a00f76294d2d3 100644 (file)
--- a/formats/ctf/metadata/Makefile.am
+++ b/formats/ctf/metadata/Makefile.am
@@ -1,4 +1,5 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
+               -I$(top_srcdir)/formats/ctf/metadata
 BUILT_SOURCES = ctf-parser.h
 AM_YFLAGS = -t -d -v
 
@@ -11,13 +12,13 @@ noinst_HEADERS = \
        objstack.h
 
 libctf_parser_la_SOURCES = ctf-lexer.l ctf-parser.y objstack.c
-libctf_parser_la_CFLAGS = $(AM_CFLAGS) -include ctf-scanner-symbols.h
+libctf_parser_la_CFLAGS = $(AM_CFLAGS)
 
+libctf_ast_la_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/formats/ctf/metadata
 libctf_ast_la_SOURCES = ctf-visitor-xml.c \
                ctf-visitor-parent-links.c \
                ctf-visitor-semantic-validator.c \
                ctf-visitor-generate-io-struct.c
-
 libctf_ast_la_LIBADD = \
        $(top_builddir)/lib/libbabeltrace.la
 
@@ -33,7 +34,7 @@ endif
 
 noinst_PROGRAMS = ctf-parser-test
 ctf_parser_test_SOURCES = ctf-parser-test.c
-
+ctf_parser_test_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/formats/ctf/metadata
 ctf_parser_test_LDADD = \
                libctf-parser.la \
                libctf-ast.la