Fix: man: you can't link a lib with a static lib

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b79d2dd9086fde3e3a524286d129e4f45cdc5e17..9fb955658cae7f9a03f49b4228a4b311ae235d3d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,13 +4,20 @@ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
                liblttng-ust \
                liblttng-ust-ctl \
                liblttng-ust-fork \
-               liblttng-ust-dl \
                liblttng-ust-libc-wrapper \
                liblttng-ust-cyg-profile \
                tools
 
+if HAVE_DLINFO
+SUBDIRS += liblttng-ust-dl
+endif
+
 if BUILD_JNI_INTERFACE
-SUBDIRS += liblttng-ust-java liblttng-ust-jul
+SUBDIRS += liblttng-ust-java
+endif
+
+if BUILD_JAVA_AGENT
+SUBDIRS += liblttng-ust-java-agent
 endif
 
 SUBDIRS += tests doc
@@ -21,6 +28,6 @@ SUBDIRS += tests doc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = lttng-ust.pc
 
-dist_doc_DATA = README ChangeLog
+dist_doc_DATA = README.md ChangeLog
 
 dist_noinst_DATA = CodingStyle