Cleanup: popt library detection

[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 a7a4631dbdb6f29cf3dc13487debac5f078ebc38..8c6e877913718b22d0f79a6ecd6d58e071c66a93 100644 (file)
--- a/plugins/ctf/common/metadata/Makefile.am
+++ b/plugins/ctf/common/metadata/Makefile.am
@@ -1,5 +1,4 @@
-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
 
@@ -8,10 +7,10 @@ noinst_LTLIBRARIES = libctf-parser.la libctf-ast.la
 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 \
@@ -20,9 +19,13 @@ libctf_ast_la_SOURCES = \
        objstack.h \
        parser.h \
        scanner.h \
-       scanner-symbols.h
+       scanner-symbols.h \
+       decoder.c \
+       decoder.h \
+       logging.c \
+       logging.h
 
-libctf_ast_la_LIBADD = $(top_builddir)/lib/libbabeltrace.la
+libctf_ast_la_LIBADD =
 
 if BABELTRACE_BUILD_WITH_LIBUUID
 libctf_ast_la_LIBADD += -luuid
@@ -33,7 +36,7 @@ libctf_ast_la_LIBADD += -lc
 endif
 
 if BABELTRACE_BUILD_WITH_MINGW
-libctf_ast_la_LIBADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt
+libctf_ast_la_LIBADD += -lrpcrt4 -lintl -liconv -lole32 $(POPT_LIBS)
 endif
 
 CLEANFILES = $(BUILT_SOURCES) parser.output