tests: return the proper TAP exit code

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 475b31a4d7bcabbe273af9680f262044ee68a819..7d7df790f8e60c2fe2d67ded75dd8c0a449103f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,37 +1,14 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include              \
-       common                  \
-       ctfser                  \
-       fd-cache                \
-       compat                  \
-       logging                 \
-       lib
-
-if ENABLE_PYTHON_PLUGINS
-# Only build the Python plugin provider shared object if the
-# configuration doesn't ask to make it built-in.
-SUBDIRS += python-plugin-provider
-endif
-
-SUBDIRS +=                     \
-       plugins                 \
-       cli                     \
-       bindings                \
-       doc                     \
-       extras                  \
+SUBDIRS = \
+       include \
+       src \
+       doc \
        tests
 
-dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-               std-ext-lib.txt README CONTRIBUTING.adoc
+dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt lgpl-2.1.txt \
+               std-ext-lib.txt README.adoc CONTRIBUTING.adoc
 
 dist_noinst_DATA = CodingStyle
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
-
-# 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
+EXTRA_DIST = version