asix-sigma: Split into api.c and protocol.[ch] modules.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1079ce8a8d9ca5a418d71c33dc4217b8241e67df..cd21a6884afa6731df1485cabe45577c77b15af7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,8 +174,9 @@ libsigrok_la_SOURCES += \
 endif
 if HW_ASIX_SIGMA
 libsigrok_la_SOURCES += \
-       src/hardware/asix-sigma/asix-sigma.h \
-       src/hardware/asix-sigma/asix-sigma.c
+       src/hardware/asix-sigma/protocol.h \
+       src/hardware/asix-sigma/protocol.c \
+       src/hardware/asix-sigma/api.c
 endif
 if HW_ATTEN_PPS3XXX
 libsigrok_la_SOURCES += \
@@ -581,13 +582,16 @@ $(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
                bindings/cxx/enums.timestamp
        $(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
 
+# Macro definitions to be used by the SWIG parser.
+swig_defs = -Dnoexcept= -Dprivate=protected -DG_GNUC_BEGIN_IGNORE_DEPRECATIONS= -DG_GNUC_END_IGNORE_DEPRECATIONS=
+
 if BINDINGS_PYTHON
 
 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='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)'
+setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)'
 setup_quiet = --quiet
 setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)
 
@@ -610,7 +614,7 @@ $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
                $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \
                @ORDER@ bindings/cxx/libsigrokcxx.la
        $(AM_V_at)$(setup_py) clean --all 2>/dev/null
-       $(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" build_py
+       $(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" --swig-opts '$(swig_defs)' build_py
        $(AM_V_at): >$@
 
 python-install:
@@ -658,7 +662,7 @@ $(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.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++ -Dnoexcept= -Dprivate=protected \
+       $(AM_V_GEN)$(SWIG) -c++ $(swig_defs) \
                -java -package org.sigrok.core.classes \
                -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
                -outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)