X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=2bd6bf048f877a38e6132e77086e14965a9ae0e1;hb=2faa355b46e183a996429ee3df1eb3f7f5f13d18;hp=63613f885912907a775b99f1d6069dbcfc6ab206;hpb=beb0fb75663091c20765a8508162711ba828f456;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 63613f88..2bd6bf04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,18 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =			\
-	include			\
+SUBDIRS = include		\
 	common			\
 	compat			\
-	logging
+	logging			\
+	lib
 
-if WITH_PYTHON_PLUGINS
+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 +=			\
-	lib			\
 	plugins			\
 	cli			\
 	bindings		\
@@ -28,10 +27,3 @@ 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