X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=Makefile.am;h=e61735d421e8cf719d5a62e93c9dd7e01900847e;hp=f881570042b5b16d1844c32902c64f8b14b35c45;hb=refs%2Fheads%2Fstable-2.1;hpb=25123621e72daf757b53fe8b5f28130a98016988

diff --git a/Makefile.am b/Makefile.am
index f8815700..e61735d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,24 @@
-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 snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
 
-CLEANFILES = $(ldscripts_DATA)
+#temporarily disabled
+# liblttng-ust-malloc
 
-libust_FORMAT := $(shell case $(shell uname -m) in (i*86) echo elf32-i386 ;; (x86_64) echo elf64-x86-64 ;; (ppc) echo elf32-powerpc ;; (ppc64) echo elf64-powerpc ;; (s390) echo elf32-s390 ;; (s390x) echo elf64-s390 ;; esac)
-libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@${libust_FORMAT}@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
 
-libust-initializer.o: libust-initializer.c
-	$(CC) -c $(CFLAGS) -o $@ $<
+dist_doc_DATA = README ChangeLog
+
+dist_noinst_DATA = CodingStyle