Fix Makefile.am files regarding headers

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 <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e73ad9d1320c885a69ee486f46f2fbed9496ac3e..2d697dbbbf5ca8751b2af65c88ba0466fedfd62f 100644 (file)
--- 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 e916266e630fb63b4d534eb9693f5b3a3613d51f..4ad2b0ee6d5f2298a1b3152ee273b7e88444db0d 100644 (file)
--- 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 e29800b256a233902c6640e6384ca1d7403fd2fe..a7a4631dbdb6f29cf3dc13487debac5f078ebc38 100644 (file)
--- 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 e9c693112d188e795a3bdcd231be39b537219401..2c9752afe86bb7761d3ecfebdaac46cac1638197 100644 (file)
--- 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 4585c8ea4f092aede94b5e0e0492ff65445d666a..3c5c8b6fd147d11ac3e490587bcc67429a890b98 100644 (file)
--- 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 339e432c313707d14c4ba4a96c785626294dca0c..3e72abbff4ef5b06ba9554dfa6944b2d0aaf3a73 100644 (file)
--- 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 2aed0496379ec56d1b7824551e0babfb2fb88560..b9cca03f513f1cb725a169dca33a4c73fbf8c571 100644 (file)
--- 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 cada4e3bee44dd0a9d7437d84c98b92e3bfeb5c2..943fc22cfa6cc02828c4e31c09dbce7cb7cf0b2b 100644 (file)
--- 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 637564fa9532be532796db1baf80765ccbe3afae..cf1fba4d7b41098027560bb7f8b281a8941cd6e1 100644 (file)
--- 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 2f3239ebde2442da87c7ab7e9b73ab39ffddfd6f..62c4f05484904ece84944242512ec147519d3dd3 100644 (file)
--- 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)