Fix: use `babeltrace2` instead of `babeltrace` in plugin paths

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 98fd7d44fcb07098f9c5dc4471d9eb66c61e49db..33abcf8b71d980d4742e5f5ee8d8bee7dcb11190 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = include              \
        common                  \
+       ctfser                  \
+       fd-cache                \
        compat                  \
        logging                 \
        lib
@@ -16,9 +18,9 @@ SUBDIRS +=                    \
        plugins                 \
        cli                     \
        bindings                \
-       tests                   \
        doc                     \
-       extras
+       extras                  \
+       tests
 
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
                std-ext-lib.txt README CONTRIBUTING.adoc
@@ -26,9 +28,10 @@ dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
 dist_noinst_DATA = CodingStyle
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
+pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf.pc
 
-CONTRIBUTING.html: $(srcdir)/CONTRIBUTING.adoc
-       asciidoc --verbose -a source-highlighter=pygments $<
+# This is a convenience target, it's not part of the build process.
+CONTRIBUTING.html: CONTRIBUTING.adoc
+       $(ASCIIDOC) --verbose -a source-highlighter=pygments $<
 
 CLEANFILES = CONTRIBUTING.html