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 7f3ada3e39b5e11a55490b8c7230f1404dad024b..5564203d7376e925342acf2c92845974473a28b1 100644 (file)
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -9,7 +9,7 @@ all-local: $(INIT_PY)
 $(INIT_PY): $(INIT_PY_IN)
        sed "s/BABELTRACE_VERSION_STR/$(PACKAGE_VERSION)/g" < $< > $@
 
-AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/
+AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ -I$(top_srcdir)/bindings/python
 
 EXTRA_DIST = common.py reader.py writer.py $(INIT_PY_IN) $(NATIVEBT_I)
 nodist_btpackage_PYTHON = $(INIT_PY) $(NATIVEBT_PY) common.py reader.py writer.py

diff --git a/formats/ctf/Makefile.am b/formats/ctf/Makefile.am
index 0c054ef47a91b3716f32b58120c115742026c85b..fdf4c293ccd938b975d470aac4c78981b5ccf417 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 ir .
 

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