Cleanup: remove useless Makefiles from extras

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 76114749790e84f555bae56c326c35dc666d4ed4..f73b6d475aba61a0930d1608523ff304e24257b5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = include              \
        common                  \
        ctfser                  \
+       fd-cache                \
        compat                  \
        logging                 \
        lib
@@ -18,18 +19,22 @@ SUBDIRS +=                  \
        cli                     \
        bindings                \
        doc                     \
-       extras                  \
        tests
 
+# Directories added to EXTRA_DIST will be recursively copied to the distribution.
+EXTRA_DIST = \
+       extras
+
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
                std-ext-lib.txt README CONTRIBUTING.adoc
 
 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