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

diff --git a/Makefile.am b/Makefile.am
index 2cab9628..fd9cbe94 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 tests \
+		libustjava libustfork
+
+#temporarily disabled
+# . libustinstr-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc