diff swig/java/Makefile.am @ 133:15bc88384ecd

Java SWIG bindings improvements

--- a/swig/java/Makefile.am	Sun Jun 10 12:11:15 2012 +0100
+++ b/swig/java/Makefile.am	Wed Jun 13 15:08:11 2012 +0100
@@ -30,6 +30,8 @@
 	xtract_unit_t.java \
 	xtract_vector_t.java \
 	xtract_window_types_.java 
+
+
 	
 javaclasses = \
 	floatArray.class \
@@ -63,6 +65,8 @@
 	xtract_vector_t.class \
 	xtract_window_types_.class 
 	
+nonautojavasources = SWIG.java
+nonautojavaclasses = SWIG.class
 
 #javasources = \
 #	xtractJNI.java \
@@ -81,26 +85,28 @@
 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