X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=dc88c46ea07b47ba17026b4757383c2d8e45e540;hb=refs%2Fheads%2Fstable-2.2;hp=be14587eeb2f130ec1ee9f027462e949daa186ac;hpb=89edbbc3ab8ae58e3c6d9c47e7a123f1514d0338;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index be14587e..dc88c46e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,25 @@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I config
 
-# The order here is tricky. SUBDIRS applies both to compilation and
-# installation. Programs depending on the libs must be built after
-# libust and '.' (that contains the linker script). However, '.'
-# must be installed after libust so it can overwrite libust.so with
-# the linker script.
-SUBDIRS = libust . tests libmallocwrap ustd ustctl libinterfork include
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		liblttng-ust-cyg-profile \
+		tools \
+		tests \
+		doc
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+#temporarily disabled
+# liblttng-ust-malloc
 
-CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
 
-libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
+dist_doc_DATA = README ChangeLog
 
-libust-initializer.o: libust-initializer.c
-	$(CC) $(CFLAGS) -c -I$(top_srcdir)/include -o $@ $<
+dist_noinst_DATA = CodingStyle