diff --git a/bindings/java/jni/Makefile.am b/bindings/java/jni/Makefile.am index 0ad6fbddb09fc087e09464b8c674cf2d068feda9..581cd6235238493b4bc2eb79a2a0997bb9f0809f 100644 --- a/bindings/java/jni/Makefile.am +++ b/bindings/java/jni/Makefile.am @@ -3,6 +3,7 @@ EXTRA_DIST = .indent.pro lib_LTLIBRARIES = libtsk_jni.la libtsk_jni_la_SOURCES = dataModel_SleuthkitJNI.cpp dataModel_SleuthkitJNI.h +libtsk_jni_la_LIBADD = ../../../tsk3/libtsk3.la indent: indent *.cpp *.h diff --git a/bindings/java/jni/Makefile.in b/bindings/java/jni/Makefile.in index 7a23e85a5a9d07c2da0fbd179f8e6bc45ee66608..cb3e6f8bc4eb2505443d755453ffae7ef25197a0 100644 --- a/bindings/java/jni/Makefile.in +++ b/bindings/java/jni/Makefile.in @@ -54,7 +54,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libtsk_jni_la_LIBADD = +libtsk_jni_la_DEPENDENCIES = ../../../tsk3/libtsk3.la am_libtsk_jni_la_OBJECTS = dataModel_SleuthkitJNI.lo libtsk_jni_la_OBJECTS = $(am_libtsk_jni_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(top_builddir)/tsk3@am__isrc@ @@ -213,6 +213,7 @@ AM_CPPFLAGS = -I../../.. -I$(srcdir)/../../.. -Wall $(JNI_CPPFLAGS) EXTRA_DIST = .indent.pro lib_LTLIBRARIES = libtsk_jni.la libtsk_jni_la_SOURCES = dataModel_SleuthkitJNI.cpp dataModel_SleuthkitJNI.h +libtsk_jni_la_LIBADD = ../../../tsk3/libtsk3.la all: all-am .SUFFIXES: diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java index df275915a4d529d0716c9983d54b382dd8640956..c7632db458b3dea6fada0caa418eb54dfbefa239 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java +++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java @@ -70,10 +70,11 @@ public class SleuthkitJNI { System.loadLibrary("zlib1"); System.loadLibrary("libewf"); } - catch (Exception ex) { + catch (UnsatisfiedLinkError e) { // @@@ LOG?? } System.loadLibrary("libtsk_jni"); + //System.load("/Users/brianc/proj/github/bindings/java/jni/.libs/libtsk_jni.0.dylib"); }