Re-organize sources

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 98fd7d44fcb07098f9c5dc4471d9eb66c61e49db..745ff31e1cac9d32169c20f941a893222d9d9bba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,13 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include              \
-       common                  \
-       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                \
-       tests                   \
-       doc                     \
+SUBDIRS = \
+       include \
+       src \
+       doc \
+       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 \
@@ -25,10 +15,8 @@ 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
-
-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