From 13778bbf013965eb6ec51f3b159db2b5ca0247eb Mon Sep 17 00:00:00 2001 From: jwallace <wallace.je@husky.neu.edu> Date: Thu, 26 Sep 2013 15:33:21 -0400 Subject: [PATCH] Added autotools support for building/installing TSK datamodel jar file. --- Makefile.am | 4 ++-- bindings/java/Makefile.am | 10 ++++++++++ configure.ac | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 bindings/java/Makefile.am diff --git a/Makefile.am b/Makefile.am index a3f2f2c1e..1ab01b51e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,9 +62,9 @@ if CPPUNIT UNIT_TESTS=unit_tests endif if X_JNI - JNI=bindings/java/jni + JAVA_BINDINGS=bindings/java/ endif -SUBDIRS = tsk tools tests samples man $(UNIT_TESTS) $(JNI) +SUBDIRS = tsk tools tests samples man $(UNIT_TESTS) $(JAVA_BINDINGS) nobase_include_HEADERS = tsk/libtsk.h tsk/tsk_incs.h \ tsk/base/tsk_base.h tsk/base/tsk_os.h \ diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am new file mode 100644 index 000000000..4d27cad3c --- /dev/null +++ b/bindings/java/Makefile.am @@ -0,0 +1,10 @@ +SUBDIRS = jni + +tsk_jar = $(top_builddir)/bindings/java/dist/Tsk_DataModel.jar +jardir = $(datadir)/java +jar_DATA = $(tsk_jar) + +$(tsk_jar): + ant dist + +CLEANFILES = $(tsk_jar) diff --git a/configure.ac b/configure.ac index 55c58627d..83ac6b25a 100644 --- a/configure.ac +++ b/configure.ac @@ -260,6 +260,7 @@ AC_CONFIG_FILES([Makefile tests/Makefile samples/Makefile man/Makefile + bindings/java/Makefile bindings/java/jni/Makefile unit_tests/Makefile unit_tests/base/Makefile]) -- GitLab