X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=fd9cbe949e86e74f565d32a89d0906978d70e04b;hb=6cdf29f8cd289d763fae461c618975fe43095e8b;hp=2262c22a89f74ca64de3fc29333c3b076551a0f1;hpb=7b92d97d242b6de7a4125b6586cbfcffdba5fe39;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 2262c22a..fd9cbe94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,10 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc tests \
+		libustjava libustfork
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+#temporarily disabled
+# . libustinstr-malloc
 
-CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
-
-libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
-
-libust-initializer.o: libust-initializer.c
-	$(CC) $(CFLAGS) -c -I$(top_srcdir)/include -o $@ $<
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc