-$(JLIB): $(JSRC) bindings/cxx/libsigrokxx.la
- $(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
- -fno-strict-aliasing -fPIC -shared \
- $(JDIR)/$(JPKG)/classes_wrap.cxx -lsigrokxx \
- -o $(JLIB)
+$(JDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+ $(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS)
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py java $(CPPXMLDOC) > $@
+
+$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i \
+ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
+ $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS)
+ -$(AM_V_at)rm -f $(java_cleanfiles)
+ $(AM_V_GEN)$(SWIG) -c++ -java -package org.sigrok.core.classes \
+ -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
+ -outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)
+
+$(JJAR): $(JCXX)
+ $(AM_V_GEN)$(JAVAC) -d $(JDIR) $(JSRC)
+ $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
+
+$(JLIB): $(JCXX) \
+ $(library_include_HEADERS) $(nodist_library_include_HEADERS) \
+ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
+ $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \
+ @ORDER@ bindings/cxx/libsigrokcxx.la
+ $(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \
+ -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
+ -lsigrokcxx $(LIBSIGROKCXX_LIBS) -o $(JLIB)