From 1bf1d54c93a72efb0ac577fd40830bff303af24d Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Sat, 17 Oct 2015 15:19:05 -0400 Subject: [PATCH] Cleanup: Don't hardcode include paths unnecessarily MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- formats/ctf/Makefile.am | 3 +-- formats/ctf/metadata/Makefile.am | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) 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 -- 2.34.1