From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sat, 17 Oct 2015 19:19:05 +0000 (-0400)
Subject: Cleanup: Don't hardcode include paths unnecessarily
X-Git-Tag: v1.3.1~3
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=1bf1d54c93a72efb0ac577fd40830bff303af24d

Cleanup: Don't hardcode include paths unnecessarily

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/ctf/Makefile.am b/formats/ctf/Makefile.am
index 2267ce57..cfb2bc7e 100644
--- a/formats/ctf/Makefile.am
+++ b/formats/ctf/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
-		-I$(top_builddir)/formats/ctf
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(builddir)
 
 SUBDIRS = types metadata writer .
 
diff --git a/formats/ctf/metadata/Makefile.am b/formats/ctf/metadata/Makefile.am
index d54c12c1..cc67e9e0 100644
--- a/formats/ctf/metadata/Makefile.am
+++ b/formats/ctf/metadata/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
-		-I$(top_srcdir)/formats/ctf/metadata
+		-I$(srcdir)
 BUILT_SOURCES = ctf-parser.h
 AM_YFLAGS = -t -d -v
 
@@ -17,7 +17,7 @@ libctf_parser_la_SOURCES = ctf-lexer.l ctf-parser.y objstack.c
 libctf_parser_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir) \
 		-include $(srcdir)/ctf-scanner-symbols.h
 
-libctf_ast_la_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/formats/ctf/metadata
+libctf_ast_la_CFLAGS = $(AM_CFLAGS) -I$(builddir)
 libctf_ast_la_SOURCES = ctf-visitor-xml.c \
 		ctf-visitor-parent-links.c \
 		ctf-visitor-semantic-validator.c \
@@ -37,7 +37,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_CFLAGS = $(AM_CFLAGS) -I$(builddir)
 ctf_parser_test_LDADD = \
 		libctf-parser.la \
 		libctf-ast.la