SWIG: Define "noexcept" empty to work around SWIG bug

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ab93285778034ffc6bbd0616d6d1087366863aac..582b38f7d47107689c7871add24440cf6d14801f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -317,6 +317,12 @@ libsigrok_la_SOURCES += \
        src/hardware/kern-scale/protocol.c \
        src/hardware/kern-scale/api.c
 endif
+if HW_KORAD_KDXXXXP
+libsigrok_la_SOURCES += \
+       src/hardware/korad-kdxxxxp/protocol.h \
+       src/hardware/korad-kdxxxxp/protocol.c \
+       src/hardware/korad-kdxxxxp/api.c
+endif
 if HW_LASCAR_EL_USB
 libsigrok_la_SOURCES += \
        src/hardware/lascar-el-usb/protocol.h \
@@ -518,7 +524,8 @@ tests_main_SOURCES = \
        tests/version.c \
        tests/driver_all.c \
        tests/device.c \
-       tests/trigger.c
+       tests/trigger.c \
+       tests/analog.c
 
 tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
 
@@ -644,7 +651,7 @@ $(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 \
+       $(AM_V_GEN)$(SWIG) -c++ -Dnoexcept= -java -package org.sigrok.core.classes \
                -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
                -outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)