X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=7d7df790f8e60c2fe2d67ded75dd8c0a449103f3;hp=938dc75bbcdf23b7bdf868dfcfc9d0e5d0c2aaf5;hb=356ada2b3523dc7f056973111399915153c6294a;hpb=bf43665775513c187cce8a1fea97eeaf36bc6c35

diff --git a/Makefile.am b/Makefile.am
index 938dc75b..7d7df790 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,14 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include		\
-	common			\
-	ctfser			\
-	fd-cache		\
-	compat			\
-	logging			\
-	lib			\
-	python-plugin-provider	\
-	ctf-writer		\
-	plugins			\
-	cli			\
-	bindings		\
-	doc			\
+SUBDIRS = \
+	include \
+	src \
+	doc \
 	tests
 
-# Directories added to EXTRA_DIST will be recursively copied to the distribution.
-EXTRA_DIST = \
-	extras
-
-dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-		std-ext-lib.txt README CONTRIBUTING.adoc
+dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt lgpl-2.1.txt \
+		std-ext-lib.txt README.adoc CONTRIBUTING.adoc
 
 dist_noinst_DATA = CodingStyle
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf-writer.pc
-
-# This is a convenience target, it's not part of the build process.
-CONTRIBUTING.html: CONTRIBUTING.adoc
-	$(ASCIIDOC) --verbose -a source-highlighter=pygments $<
-
-CLEANFILES = CONTRIBUTING.html
+EXTRA_DIST = version