Merge branch 'master' of git://git.dorsal.polymtl.ca/git/liblttngtrace

[lttv.git] / ltt / Makefile.am

diff --git a/ltt/Makefile.am b/ltt/Makefile.am
index aab53f96773e856c2cb38d4163a37a903eae8a47..641bb4c7f2333210680d9756cbaa9d4d6225ca77 100644 (file)
--- a/ltt/Makefile.am
+++ b/ltt/Makefile.am
@@ -7,11 +7,19 @@
 #libdir = ${lttlibdir}
 
 AM_CFLAGS = $(PACKAGE_CFLAGS)
-LIBS += $(GLIB_LIBS)
-LIBS += $(THREAD_LIBS)
 
+if BUILD_JNI_INTERFACE
+lib_LTLIBRARIES = liblttvtraceread.la liblttvtraceread_loader.la
+liblttvtraceread_la_SOURCES = jni_interface.c tracefile.c marker.c event.c
+liblttvtraceread_loader_la_SOURCES= lttvtraceread_loader.c
+else
 lib_LTLIBRARIES = liblttvtraceread.la
 liblttvtraceread_la_SOURCES = tracefile.c marker.c event.c
+endif
+
+liblttvtraceread_la_LDFLAGS = -release 2.6
+liblttvtraceread_loader_la_LDFLAGS = -release 2.6
+
 noinst_HEADERS = ltt-private.h
 
 lttinclude_HEADERS = \