X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=b9cc1e7d1637977d40d97d36adc71ea9ecdd46e5;hb=003fedf4968e55d8f7711faf784a37d2804c3a21;hp=1bdedea2118f695c470d052f51b8d7bccfc76532;hpb=fbca6b624335eef18c8d86194aeb101a720168f4;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 1bdedea2..b9cc1e7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,10 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc
-dist_bin_SCRIPTS = usttrace
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust libustctl \
+		include doc libustjava libustfork tests
+
+#temporarily disabled
+# . libustinstr-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc