Merge branch 'master' into bindings/python

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e824e4cb0baf01a5a9fd74576eaed4df5fe60ea3..d28fbc0f78f2e233e172bfc5b774c40eb0ae6011 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,12 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include types formats lib converter tests
+SUBDIRS = include types lib formats converter bindings tests doc extras
 
-dist_doc_DATA = ChangeLog
+dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
+               std-ext-lib.txt
+
+dist_noinst_DATA = CodingStyle
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = babeltrace.pc