X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=e231e085d9dfdb4e7a76ea2d50a5418262ea107e;hb=9d36f30e825135d8fbb3ba6cb31ab10aa938b135;hp=cd81be0e3f42363a4e629efef1e45e61e2aa4bbc;hpb=c5a7fbbd654a42b2e9addea9ab035073e5d7a5fd;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index cd81be0e..e231e085 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,22 @@
-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) $(CFLAGS) -c -I$(top_srcdir)/include -o $@ $<
+dist_doc_DATA = README ChangeLog