X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=0a64094b756e6a09dce3ed8ad0b700de33f9ecbb;hb=4847e9bbec5a73140193185073437d95fdf15f30;hp=2cab9628eb2df33a43b990ab34c4bfab984260d8;hpb=1304f3dfeb42271cebb865409bd3e010e2512aa4;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 2cab9628..0a64094b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,10 @@
-SUBDIRS = libmarkers
+ACLOCAL_AMFLAGS = -I config
+
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc \
+		libustjava libustfork tests
+
+#temporarily disabled
+# . libustinstr-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc