X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=fd9cbe949e86e74f565d32a89d0906978d70e04b;hb=02fb33819486765abe837521d9fb4ced14200dda;hp=dd92eaf31e02749b2073bc72af40b996d7d3d7ad;hpb=5f118a1c28ec1a3b4ad0dc847dac9636ce69852d;p=lttng-ust.git

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