X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile.am;h=b9cc1e7d1637977d40d97d36adc71ea9ecdd46e5;hb=d4419b81b243bc3a6bdd4a09b3ca2216d044a1c7;hp=f8620dfbaee8dd89c56e18f3e96fe3553739dd16;hpb=e0baa9906b1c443228605a2b29c37b4bc004c61c;p=lttng-ust.git

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