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

diff --git a/Makefile.am b/Makefile.am
index f1ccfcf1..b9cc1e7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,10 @@
-SUBDIRS = libmarkers libtracectl libtracing
+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