X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=4c6b4d37a9197a66f86a78748a1749a233d042d5;hb=cdcf612f76937cfd654a3564fb77676768a44299;hp=1d66b1d4ce6c81a88fc8208410e2f2a3b9fb01f8;hpb=6fbd4105b92d0da8b3c5818a5b7c5b07850f4a01;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 1d66b1d4..4c6b4d37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,21 +2,21 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =			\
-	include			\
+SUBDIRS = include		\
 	common			\
-	types			\
-	compat
+	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			\
-	formats			\
 	plugins			\
-	converter		\
+	cli			\
 	bindings		\
 	tests			\
 	doc			\
@@ -29,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