X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=4c6b4d37a9197a66f86a78748a1749a233d042d5;hb=151a8109923ad34382dca7f284ea28887674a848;hp=0544bd1684aaee0d03688d435763fa9edee2e09e;hpb=06a626b83f4426ea5b8d3199d1edf5a07594026e;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 0544bd16..4c6b4d37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,25 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include types compat lib formats plugins converter bindings tests doc extras
+SUBDIRS = include		\
+	common			\
+	compat			\
+	logging
+
+if WITH_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 +=			\
+	lib			\
+	plugins			\
+	cli			\
+	bindings		\
+	tests			\
+	doc			\
+	extras
 
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
 		std-ext-lib.txt README
@@ -11,3 +29,10 @@ dist_noinst_DATA = CodingStyle
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
+
+# Create a symlink from libbabeltrace-ctf to libbabeltrace.
+# CTF writer used to be in libbabeltrace-ctf in Babeltrace 1, so this
+# file must still exist. As of Babeltrace 2, CTF writer is implemented
+# in libbabeltrace, hence the symlink.
+install-exec-hook:
+	$(LN_S) -f libbabeltrace.so $(DESTDIR)$(libdir)/libbabeltrace-ctf.so