Assorted build system fixes for C++/Python/Java bindings.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e535b517badf10ed377691ed99e3bafe9f77255d..777aff85e6a426e7031a3af95cc4cf3134741c65 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -385,7 +385,7 @@ lib_LTLIBRARIES += bindings/cxx/libsigrokxx.la
 
 bindings_cxx_libsigrokxx_la_SOURCES = bindings/cxx/classes.cpp
 
-bindings_cxx_libsigrokxx_la_LIBADD = -lsigrok $(glibmm_LIBS)
+bindings_cxx_libsigrokxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 
 bindings_cxx_libsigrokxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
@@ -412,14 +412,21 @@ CLEAN_EXTRA =
 
 if BINDINGS_PYTHON
 
-python-build: bindings/cxx/libsigrokxx.la
-       cd bindings/python && python setup.py build
+PDIR = bindings/python
+
+python-build: $(PDIR)/timestamp
+
+$(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i
+       cd $(PDIR) && python setup.py clean --all
+       cd $(PDIR) && python setup.py build
+       touch $(PDIR)/timestamp
 
 python-install:
-       cd bindings/python && python setup.py install
+       cd $(PDIR) && python setup.py install --prefix $(prefix)
 
 python-clean:
-       cd bindings/python && python setup.py clean --all
+       cd $(PDIR) && python setup.py clean --all
+       rm -f $(PDIR)/timestamp
 
 BUILD_EXTRA += python-build
 INSTALL_EXTRA += python-install
@@ -427,9 +434,53 @@ CLEAN_EXTRA += python-clean
 
 endif
 
+if BINDINGS_JAVA
+
+JDIR = bindings/java
+JPKG = org/sigrok/core/classes
+JINT = $(JDIR)/$(JPKG)/classes.i
+JSRC = $(JDIR)/$(JPKG)/classes_wrap.cxx
+JLIB = $(JDIR)/libsigrok_java_core_classes.so
+JJAR = $(JDIR)/sigrok-core.jar
+
+java-build: $(JJAR) $(JLIB)
+
+$(JSRC): $(JINT) bindings/swig/classes.i
+       swig -c++ -java -package org.sigrok.core.classes \
+               -Iinclude -Ibindings/cxx/include \
+               -outdir $(JDIR)/$(JPKG) $(JINT)
+
+$(JJAR): $(JSRC) $(JDIR)/$(JPKG)/*.java
+       $(JAVAC) -sourcepath $(JDIR) $(JDIR)/$(JPKG)/*.java
+       jar cf $(JJAR) -C $(JDIR) $(JPKG)
+
+$(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)
+
+java-install:
+       $(INSTALL) -d $(libdir)/jni
+       $(INSTALL) $(JLIB) -t $(libdir)/jni
+       $(INSTALL) -d $(datadir)/java
+       $(INSTALL) $(JJAR) -t $(datadir)/java
+
+java-clean:
+       rm -f $(JSRC)
+       rm -f $(JDIR)/$(JPKG)/*.class
+       rm -f $(JJAR)
+       rm -f $(JLIB)
+
+BUILD_EXTRA += java-build
+INSTALL_EXTRA += java-install
+CLEAN_EXTRA += java-clean
+
+endif
+
 all-local: $(BUILD_EXTRA)
 install-exec-local: $(INSTALL_EXTRA)
-clean-extra: $(CLEAN_EXTRA)
+clean-local: $(CLEAN_EXTRA)
 
 MAINTAINERCLEANFILES = ChangeLog