Merged changes needed by JNI in latest LTTv version

[lttv.git] / ltt / Makefile.am

diff --git a/ltt/Makefile.am b/ltt/Makefile.am
index 8f17b098f61af1a6a96f44648a1e6db4a57367ab..641bb4c7f2333210680d9756cbaa9d4d6225ca77 100644 (file)
--- a/ltt/Makefile.am
+++ b/ltt/Makefile.am
@@ -6,12 +6,20 @@
 
 #libdir = ${lttlibdir}
 
-AM_CFLAGS = $(GLIB_CFLAGS) 
-LIBS += $(GLIB_LIBS)
-LIBS += $(THREAD_LIBS)
+AM_CFLAGS = $(PACKAGE_CFLAGS)
 
+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 = \