C++: Include enum classes when generating documentation.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 06832cae32d5703134f88ebfeb805d0584c5892e..c47639f71873d0b0c9f9c7695019b424408e8e7e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,14 @@ local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
 if BINDINGS_CXX
 local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx
 endif
+# Do not hard-code the firmware location on Windows.
+if WIN32
+global_defs =
+else
+global_defs = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+endif
 # Ensure that local include directories are always searched first.
-AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+AM_CPPFLAGS = $(local_includes) $(global_defs)
 
 # The tests CFLAGS are a superset of the libsigrok CFLAGS, and the
 # python bindings CFLAGS are a superset of the C++ bindings CFLAGS.
@@ -311,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 \
@@ -481,7 +493,6 @@ EXTRA_DIST = \
        bindings/java/org/sigrok/core/classes/classes.i \
        bindings/java/org/sigrok/core/interfaces/DatafeedCallback.java \
        bindings/java/org/sigrok/core/interfaces/LogCallback.java \
-       bindings/java/org/sigrok/core/interfaces/SourceCallback.java \
        bindings/swig/classes.i \
        bindings/swig/doc.py \
        contrib/gnuplot_chronovu_la8.gpi \
@@ -512,7 +523,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)
 
@@ -638,7 +650,8 @@ $(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= -Dprivate=protected \
+               -java -package org.sigrok.core.classes \
                -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
                -outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)