X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=f966498bf5bcd749c0cecd06730280e430822c8d;hb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;hp=646b3d3026e5f9c999a15d3c2e8cc3e762628e2a;hpb=9441df61728a22747f28a713b6c00b1732acbd57;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 646b3d30..f966498b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,14 @@
-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 = . include doc snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-java \
+		tests
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+#temporarily disabled
+# liblttng-ust-malloc
 
-CLEANFILES = $(ldscripts_DATA)
-
-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