X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=Makefile.am;h=810761ca3b52cd46608dd5e667bc44b0f3f3b6ea;hp=eb0c1b5dade6ca3bd6933e3f553a6239ac11eb02;hb=0fdd0b8989a06910521827f82058f7100d9b6b8e;hpb=d159ac37826eaebf4c1d87b8db0c5e5a8ccc0b00

diff --git a/Makefile.am b/Makefile.am
index eb0c1b5d..810761ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,43 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-# 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 = snprintf libustcomm libust . tests libustinstr-malloc libustd ustd ustctl libustfork include doc
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fd \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		liblttng-ust-cyg-profile \
+		tools
 
-EXTRA_DIST = libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+if HAVE_DLINFO
+SUBDIRS += liblttng-ust-dl
+endif
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
 
-CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
+if BUILD_JAVA_AGENT
+SUBDIRS += liblttng-ust-java-agent
+endif
 
-libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" < $< > $@
+if BUILD_PYTHON_AGENT
+SUBDIRS += python-lttngust \
+		liblttng-ust-python-agent
+endif
 
-# It is very important to compile the initializer with PIC otherwise we
-# may get obscure errors when linking to shared libraries.
-libust-initializer.o: libust-initializer.c
-	$(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -o $@ $<
+SUBDIRS += tests doc
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README.md ChangeLog
+
+dist_noinst_DATA = CodingStyle
+
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop