Port fix: Windows does not allow read-only mappings > file's size

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a7fecfead89f407e361de1718bb91d6641ba00df..de436c40b9df0b712841733740a3a8100741be67 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,20 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =                      \
-       include                 \
+SUBDIRS = include              \
        common                  \
-       compat
+       compat                  \
+       logging
 
-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                 \
-       converter               \
+       cli                     \
        bindings                \
        tests                   \
        doc                     \
@@ -27,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