From 4353f87743e90ef88cb7324dec008a9230faf836 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 27 Jan 2017 13:22:48 -0500 Subject: [PATCH] Fix Makefile.am files regarding headers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Header files for convenience library and private targets can be listed in _SOURCES, and they must all be listed for the distribution to work. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- plugins/Makefile.am | 2 ++ plugins/ctf/common/btr/Makefile.am | 6 ++++-- plugins/ctf/common/metadata/Makefile.am | 10 +++++++--- plugins/ctf/common/notif-iter/Makefile.am | 5 ++++- plugins/ctf/fs/Makefile.am | 14 +++++++------- plugins/ctf/lttng-live/Makefile.am | 5 +++-- plugins/muxer/Makefile.am | 3 ++- plugins/text/Makefile.am | 5 +++-- plugins/trimmer/Makefile.am | 5 ++++- plugins/writer/Makefile.am | 4 +++- 10 files changed, 39 insertions(+), 20 deletions(-) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index e73ad9d1..2d697dbb 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1 +1,3 @@ SUBDIRS = ctf text muxer trimmer writer + +noinst_HEADERS = plugins-common.h diff --git a/plugins/ctf/common/btr/Makefile.am b/plugins/ctf/common/btr/Makefile.am index e916266e..4ad2b0ee 100644 --- a/plugins/ctf/common/btr/Makefile.am +++ b/plugins/ctf/common/btr/Makefile.am @@ -1,5 +1,7 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -noinst_HEADERS = btr.h noinst_LTLIBRARIES = libctf-btr.la -libctf_btr_la_SOURCES = btr.c +libctf_btr_la_SOURCES = \ + btr.c \ + btr.h \ + print.h diff --git a/plugins/ctf/common/metadata/Makefile.am b/plugins/ctf/common/metadata/Makefile.am index e29800b2..a7a4631d 100644 --- a/plugins/ctf/common/metadata/Makefile.am +++ b/plugins/ctf/common/metadata/Makefile.am @@ -5,8 +5,6 @@ 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_. @@ -17,7 +15,13 @@ libctf_ast_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir) libctf_ast_la_SOURCES = \ visitor-generate-ir.c \ visitor-semantic-validator.c \ - visitor-parent-links.c + visitor-parent-links.c \ + ast.h \ + objstack.h \ + parser.h \ + scanner.h \ + scanner-symbols.h + libctf_ast_la_LIBADD = $(top_builddir)/lib/libbabeltrace.la if BABELTRACE_BUILD_WITH_LIBUUID diff --git a/plugins/ctf/common/notif-iter/Makefile.am b/plugins/ctf/common/notif-iter/Makefile.am index e9c69311..2c9752af 100644 --- a/plugins/ctf/common/notif-iter/Makefile.am +++ b/plugins/ctf/common/notif-iter/Makefile.am @@ -3,4 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include noinst_LTLIBRARIES = libctf-notif-iter.la -libctf_notif_iter_la_SOURCES = notif-iter.c +libctf_notif_iter_la_SOURCES = \ + notif-iter.c \ + notif-iter.h \ + print.h diff --git a/plugins/ctf/fs/Makefile.am b/plugins/ctf/fs/Makefile.am index 4585c8ea..3c5c8b6f 100644 --- a/plugins/ctf/fs/Makefile.am +++ b/plugins/ctf/fs/Makefile.am @@ -1,11 +1,5 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins -noinst_HEADERS = \ - fs.h \ - data-stream.h \ - file.h \ - metadata.h \ - print.h noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-fs.la libbabeltrace_plugin_ctf_fs_la_LIBADD = \ @@ -14,4 +8,10 @@ libbabeltrace_plugin_ctf_fs_la_SOURCES = \ fs.c \ data-stream.c \ metadata.c \ - file.c + file.c \ + data-stream.h \ + file.h \ + fs.h \ + lttng-index.h \ + metadata.h \ + print.h diff --git a/plugins/ctf/lttng-live/Makefile.am b/plugins/ctf/lttng-live/Makefile.am index 339e432c..3e72abbf 100644 --- a/plugins/ctf/lttng-live/Makefile.am +++ b/plugins/ctf/lttng-live/Makefile.am @@ -1,7 +1,8 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins -libbabeltrace_plugin_ctf_lttng_live_la_SOURCES = lttng-live.c +libbabeltrace_plugin_ctf_lttng_live_la_SOURCES = \ + lttng-live.c \ + lttng-live-internal.h -noinst_HEADERS = lttng-live-internal.h noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-lttng-live.la diff --git a/plugins/muxer/Makefile.am b/plugins/muxer/Makefile.am index 2aed0496..b9cca03f 100644 --- a/plugins/muxer/Makefile.am +++ b/plugins/muxer/Makefile.am @@ -6,7 +6,8 @@ plugindir = "$(PLUGINSDIR)" plugin_LTLIBRARIES = libbabeltrace-plugin-muxer.la libbabeltrace_plugin_muxer_la_SOURCES = \ - muxer.h muxer.c + muxer.c \ + muxer.h libbabeltrace_plugin_muxer_la_LDFLAGS = \ -version-info $(BABELTRACE_LIBRARY_VERSION) diff --git a/plugins/text/Makefile.am b/plugins/text/Makefile.am index cada4e3b..943fc22c 100644 --- a/plugins/text/Makefile.am +++ b/plugins/text/Makefile.am @@ -7,8 +7,9 @@ plugin_LTLIBRARIES = libbabeltrace-plugin-ctf-text.la # ctf-text plugin libbabeltrace_plugin_ctf_text_la_SOURCES = \ - text.h text.c \ - print.c + text.c \ + print.c \ + text.h libbabeltrace_plugin_ctf_text_la_LDFLAGS = \ -version-info $(BABELTRACE_LIBRARY_VERSION) diff --git a/plugins/trimmer/Makefile.am b/plugins/trimmer/Makefile.am index 637564fa..cf1fba4d 100644 --- a/plugins/trimmer/Makefile.am +++ b/plugins/trimmer/Makefile.am @@ -6,7 +6,10 @@ plugindir = "$(PLUGINSDIR)" plugin_LTLIBRARIES = libbabeltrace-plugin-trimmer.la libbabeltrace_plugin_trimmer_la_SOURCES = \ - trimmer.h trimmer.c iterator.h iterator.c + trimmer.c \ + iterator.c \ + trimmer.h \ + iterator.h libbabeltrace_plugin_trimmer_la_LDFLAGS = \ -version-info $(BABELTRACE_LIBRARY_VERSION) diff --git a/plugins/writer/Makefile.am b/plugins/writer/Makefile.am index 2f3239eb..62c4f054 100644 --- a/plugins/writer/Makefile.am +++ b/plugins/writer/Makefile.am @@ -7,7 +7,9 @@ plugin_LTLIBRARIES = libbabeltrace-plugin-ctf-writer.la # ctf-writer plugin libbabeltrace_plugin_ctf_writer_la_SOURCES = \ - writer.h writer.c write.c + writer.c \ + write.c \ + writer.h libbabeltrace_plugin_ctf_writer_la_LDFLAGS = \ -version-info $(BABELTRACE_LIBRARY_VERSION) -- 2.34.1