Reset vtid after fork in child

[ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1bdedea2118f695c470d052f51b8d7bccfc76532..0a64094b756e6a09dce3ed8ad0b700de33f9ecbb 100644 (file)
--- 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 include doc \
+               libustjava libustfork tests
+
+#temporarily disabled
+# . libustinstr-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc