X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=810761ca3b52cd46608dd5e667bc44b0f3f3b6ea;hb=ab12eb57cf3fdd2c25df16a3d1e770a2642b93e8;hp=b163bf8996c6655be22bc442a00f53a3ae8ab50d;hpb=67c5b804ac870bdc3b262c0cf6cbf117f3e6bc1e;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index b163bf89..810761ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +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 liblttng-sessiond-comm libringbuffer libust include doc tests
+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
 
-#temporarily disabled
-# . libustinstr-malloc libustfork
+if HAVE_DLINFO
+SUBDIRS += liblttng-ust-dl
+endif
 
-EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+if BUILD_JAVA_AGENT
+SUBDIRS += liblttng-ust-java-agent
+endif
 
-CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
+if BUILD_PYTHON_AGENT
+SUBDIRS += python-lttngust \
+		liblttng-ust-python-agent
+endif
 
-libust.so: libust.ldscript.in
-	$(SED) -e $(if $(LIBFORMAT),"s@\@FORMAT\@@$(LIBFORMAT)@","s@.*\@FORMAT\@.*@@") < $< > $@
+SUBDIRS += tests doc
 
-# 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 -I$(top_srcdir) -o $@ $<
+#temporarily disabled
+# liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ust.pc
+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