Java: Use correct JNI function when calling Vector.add

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cd8a49d3a810f60d910a96ad8e257a7ad2e0d5b0..82a3eb7ccd752bc4eec4919e0acbe9780db1a124 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,9 +179,9 @@ src_libdrivers_la_SOURCES = src/drivers.c
 
 if HW_AGILENT_DMM
 src_libdrivers_la_SOURCES += \
-       src/hardware/agilent-dmm/api.c \
-       src/hardware/agilent-dmm/agilent-dmm.h \
-       src/hardware/agilent-dmm/sched.c
+       src/hardware/agilent-dmm/protocol.h \
+       src/hardware/agilent-dmm/protocol.c \
+       src/hardware/agilent-dmm/api.c
 endif
 if HW_APPA_55II
 src_libdrivers_la_SOURCES += \
@@ -267,7 +267,9 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_DEMO
 src_libdrivers_la_SOURCES += \
-       src/hardware/demo/demo.c
+       src/hardware/demo/protocol.h \
+       src/hardware/demo/protocol.c \
+       src/hardware/demo/api.c
 endif
 if HW_DEREE_DE5000
 src_libdrivers_la_SOURCES += \
@@ -275,8 +277,8 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_FLUKE_DMM
 src_libdrivers_la_SOURCES += \
-       src/hardware/fluke-dmm/fluke-dmm.h \
-       src/hardware/fluke-dmm/fluke.c \
+       src/hardware/fluke-dmm/protocol.h \
+       src/hardware/fluke-dmm/protocol.c \
        src/hardware/fluke-dmm/api.c
 endif
 if HW_FTDI_LA
@@ -319,8 +321,8 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_HANTEK_DSO
 src_libdrivers_la_SOURCES += \
-       src/hardware/hantek-dso/dso.h \
-       src/hardware/hantek-dso/dso.c \
+       src/hardware/hantek-dso/protocol.h \
+       src/hardware/hantek-dso/protocol.c \
        src/hardware/hantek-dso/api.c
 endif
 if HW_HP_3457A
@@ -645,7 +647,7 @@ PDIR = bindings/python
 PDOC_START = bindings/python/sigrok/core/doc_start.i
 PDOC_END = bindings/python/sigrok/core/doc_end.i
 
-setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)'
+setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CC)' CXX='$(CXX)' CFLAGS='$(CFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)'
 setup_quiet = --quiet
 setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)