aboutsummaryrefslogtreecommitdiff
path: root/swig/java/Makefile.am
diff options
context:
space:
mode:
authorJamie Bullock <jamie@postlude.co.uk>2012-06-13 15:08:11 +0100
committerJamie Bullock <jamie@postlude.co.uk>2012-06-13 15:08:11 +0100
commit71b96876d1caf0f6d0bfb82be5ca6e68da092c56 (patch)
treee503e7d6fe4b52982e832eea19a7a7ea5a69e57a /swig/java/Makefile.am
parent59dd1cb1983661d761839da8df79be11de13edb6 (diff)
downloadLibXtract-71b96876d1caf0f6d0bfb82be5ca6e68da092c56.tar.gz
LibXtract-71b96876d1caf0f6d0bfb82be5ca6e68da092c56.tar.bz2
LibXtract-71b96876d1caf0f6d0bfb82be5ca6e68da092c56.zip
Java SWIG bindings improvements
Diffstat (limited to 'swig/java/Makefile.am')
-rw-r--r--swig/java/Makefile.am14
1 files changed, 10 insertions, 4 deletions
diff --git a/swig/java/Makefile.am b/swig/java/Makefile.am
index 25452a1..09a7bfc 100644
--- a/swig/java/Makefile.am
+++ b/swig/java/Makefile.am
@@ -30,6 +30,8 @@ javasources = \
xtract_unit_t.java \
xtract_vector_t.java \
xtract_window_types_.java
+
+
javaclasses = \
floatArray.class \
@@ -63,6 +65,8 @@ javaclasses = \
xtract_vector_t.class \
xtract_window_types_.class
+nonautojavasources = SWIG.java
+nonautojavaclasses = SWIG.class
#javasources = \
# xtractJNI.java \
@@ -81,26 +85,28 @@ javaclasses = \
MAINTAINERCLEANFILES = $(javasources) Makefile.in
BUILT_SOURCES = $(srcdir)/xtract_wrap.c
-SWIG_SOURCES = ../xtract.i
+SWIG_SOURCES = jxtract.i
lib_LTLIBRARIES = libjxtract.la
libjxtract_la_SOURCES = $(srcdir)/xtract_wrap.c $(SWIG_SOURCES)
libjxtract_la_CFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
-libjxtract_la_LDFLAGS = -module -lxtract
+libjxtract_la_LDFLAGS = -lxtract
libjxtract_la_LIBADD = $(top_srcdir)/src/libxtract.la
SWIG_JAVA_OPT = -java -package xtract.core
xtract_wrap.c : $(SWIG_SOURCES)
$(SWIG) $(SWIG_JAVA_OPT) -I$(top_srcdir) -o $@ $<
- $(JAVAC) $(javasources)
+ $(JAVAC) $(nonautojavasources) $(javasources)
mkdir -p xtract/core
mkdir -p xtract/core/src
mv $(javasources) xtract/core/src
mv $(javaclasses) xtract/core
+ cp $(nonautojavasources) xtract/core/src
+ cp $(nonautojavaclasses) xtract/core
$(JAVAC) test.java
clean-local:
- -rm -f libjxtract.so xtract_wrap.c $(javasources) $(javaclasses) test.class
+ -rm -f libjxtract.so xtract_wrap.c $(javasources) $(javaclasses) $(nonautojavaclasses) test.class
-rm -rf xtract