Fix: Don't override user variables within the build system

[babeltrace.git] / plugins / ctf / common / metadata / Makefile.am

diff --git a/plugins/ctf/common/metadata/Makefile.am b/plugins/ctf/common/metadata/Makefile.am
index e29800b256a233902c6640e6384ca1d7403fd2fe..fa8b34186f268e921bf7aa826f61679a60fa151a 100644 (file)
--- a/plugins/ctf/common/metadata/Makefile.am
+++ b/plugins/ctf/common/metadata/Makefile.am
@@ -1,24 +1,31 @@
-AM_CPPFLAGS = $(CPPFLAGS) -I$(top_srcdir)/include -I$(srcdir)
-AM_CFLAGS = $(PACKAGE_CFLAGS)
+AM_CPPFLAGS += -I$(builddir) -I$(srcdir)
 BUILT_SOURCES = parser.h parser.c lexer.c
 AM_YFLAGS = -t -d -v
 
 noinst_LTLIBRARIES = libctf-parser.la libctf-ast.la
 
-noinst_HEADERS = scanner.h ast.h scanner-symbols.h
-
 libctf_parser_la_SOURCES = lexer.l parser.y objstack.c
 # ctf-scanner-symbols.h is included to prefix generated yy_* symbols
 # with bt_.
-libctf_parser_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir) \
+libctf_parser_la_CPPFLAGS = $(AM_CPPFLAGS) \
                -include $(srcdir)/scanner-symbols.h
+libctf_parser_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-function
 
-libctf_ast_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)
 libctf_ast_la_SOURCES = \
        visitor-generate-ir.c \
        visitor-semantic-validator.c \
-       visitor-parent-links.c
-libctf_ast_la_LIBADD = $(top_builddir)/lib/libbabeltrace.la
+       visitor-parent-links.c \
+       ast.h \
+       objstack.h \
+       parser.h \
+       scanner.h \
+       scanner-symbols.h \
+       decoder.c \
+       decoder.h \
+       logging.c \
+       logging.h
+
+libctf_ast_la_LIBADD =
 
 if BABELTRACE_BUILD_WITH_LIBUUID
 libctf_ast_la_LIBADD += -luuid