X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=blobdiff_plain;f=Makefile.am;h=cc923c1da4476feeca7ad2fdf62b54c3ac006155;hp=3f23249060edd5b64c583817c9de238a6775f9da;hb=09434f96935202d1e6cf64a74d4da4b95d06246d;hpb=23ae9ca88799109e397a7eb88f06e4bae6f97ae2

diff --git a/Makefile.am b/Makefile.am
index 3f232490..cc923c1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,52 @@
 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 = libust . tests libmallocwrap ustd ustctl libinterfork include
+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 = doc 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) -fPIC -c -I$(top_srcdir)/include -o $@ $<
+SUBDIRS += tests doc
+
+#temporarily disabled
+# liblttng-ust-malloc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc
+
+dist_doc_DATA = \
+	ChangeLog \
+	COPYING \
+	LICENSE \
+	README.md
+
+dist_noinst_DATA = \
+	CodingStyle \
+	CONTRIBUTING.md \
+	gpl-2.0.txt \
+	lgpl-2.1.txt \
+	mit-license.txt
+
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop