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

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