fix: tarball generation and building

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>

diff --git a/Makefile.am b/Makefile.am
index 61b0a07a53c16883dbeb92da398242d49b2df5c0..0c8d13d7c44718dbe31537461cac19d68db77530 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,3 +3,7 @@ AM_CFLAGS = $(PACKAGE_CFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src doc utils
+
+dist_doc_DATA = LICENSE \
+               ChangeLog \
+               README

diff --git a/src/Makefile.am b/src/Makefile.am
index 86c8ccb400a1afbc34549ea6be3d3abf8c56602c..1103bff0d6389d6c3e380a79eb1ed9529b49adff 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,41 +19,42 @@ noinst_HEADERS = \
        lttng-viewer-abi.h \
        lttngtop.h \
        lttng-session.h \
-       $(top_builddir)/lib/babeltrace/format.h \
+       $(top_builddir)/lib/babeltrace/align.h \
+       $(top_builddir)/lib/babeltrace/babeltrace-internal.h \
+       $(top_builddir)/lib/babeltrace/babeltrace.h \
+       $(top_builddir)/lib/babeltrace/bitfield.h \
+       $(top_builddir)/lib/babeltrace/clock-internal.h \
+       $(top_builddir)/lib/babeltrace/clock-types.h \
+       $(top_builddir)/lib/babeltrace/compat/limits.h \
        $(top_builddir)/lib/babeltrace/compat/memstream.h \
        $(top_builddir)/lib/babeltrace/compat/string.h \
        $(top_builddir)/lib/babeltrace/compat/utc.h \
        $(top_builddir)/lib/babeltrace/compat/uuid.h \
        $(top_builddir)/lib/babeltrace/compiler.h \
-       $(top_builddir)/lib/babeltrace/types.h \
        $(top_builddir)/lib/babeltrace/context-internal.h \
-       $(top_builddir)/lib/babeltrace/format-internal.h \
-       $(top_builddir)/lib/babeltrace/babeltrace.h \
-       $(top_builddir)/lib/babeltrace/trace-collection.h \
-       $(top_builddir)/lib/babeltrace/clock-internal.h \
-       $(top_builddir)/lib/babeltrace/mmap-align.h \
-       $(top_builddir)/lib/babeltrace/list.h \
-       $(top_builddir)/lib/babeltrace/iterator.h \
+       $(top_builddir)/lib/babeltrace/context.h \
        $(top_builddir)/lib/babeltrace/ctf-ir/metadata.h \
        $(top_builddir)/lib/babeltrace/ctf-text/types.h \
-       $(top_builddir)/lib/babeltrace/context.h \
-       $(top_builddir)/lib/babeltrace/iterator-internal.h \
-       $(top_builddir)/lib/babeltrace/bitfield.h \
-       $(top_builddir)/lib/babeltrace/trace-handle.h \
-       $(top_builddir)/lib/babeltrace/trace-handle-internal.h \
-       $(top_builddir)/lib/babeltrace/babeltrace-internal.h \
-       $(top_builddir)/lib/babeltrace/align.h \
-       $(top_builddir)/lib/babeltrace/ctf/types.h \
        $(top_builddir)/lib/babeltrace/ctf/callbacks-internal.h \
+       $(top_builddir)/lib/babeltrace/ctf/callbacks.h \
        $(top_builddir)/lib/babeltrace/ctf/ctf-index.h \
-       $(top_builddir)/lib/babeltrace/ctf/iterator.h \
        $(top_builddir)/lib/babeltrace/ctf/events-internal.h \
-       $(top_builddir)/lib/babeltrace/ctf/callbacks.h \
-       $(top_builddir)/lib/babeltrace/ctf/metadata.h \
        $(top_builddir)/lib/babeltrace/ctf/events.h \
-       $(top_builddir)/lib/babeltrace/clock-types.h \
+       $(top_builddir)/lib/babeltrace/ctf/iterator.h \
+       $(top_builddir)/lib/babeltrace/ctf/metadata.h \
+       $(top_builddir)/lib/babeltrace/ctf/types.h \
+       $(top_builddir)/lib/babeltrace/endian.h \
+       $(top_builddir)/lib/babeltrace/format-internal.h \
+       $(top_builddir)/lib/babeltrace/format.h \
+       $(top_builddir)/lib/babeltrace/iterator-internal.h \
+       $(top_builddir)/lib/babeltrace/iterator.h \
+       $(top_builddir)/lib/babeltrace/list.h \
+       $(top_builddir)/lib/babeltrace/mmap-align.h \
        $(top_builddir)/lib/babeltrace/prio_heap.h \
-       $(top_builddir)/lib/babeltrace/endian.h
+       $(top_builddir)/lib/babeltrace/trace-collection.h \
+       $(top_builddir)/lib/babeltrace/trace-handle-internal.h \
+       $(top_builddir)/lib/babeltrace/trace-handle.h \
+       $(top_builddir)/lib/babeltrace/types.h
 
 
 lttngtop_SOURCES = \