C++: Include enum classes when generating documentation.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fb925ce6a1a530ddcb063bc92830dd95cc450f1d..c47639f71873d0b0c9f9c7695019b424408e8e7e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -493,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 \
@@ -651,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)