zip: Provide fallback if zip_discard() is unavailable

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 58115772fbdb5f31458d45268a8dfd6d37835903..10b2d03b94d39452118b8f17c0d4420cd1f6c2b8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -581,6 +581,9 @@ $(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
@@ -602,14 +605,15 @@ $(PDOC_END): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
 python-build: $(PDIR)/timestamp
 
 $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
-               bindings/swig/classes.i bindings/swig/enums.i $(PDOC_START) \
-               $(PDOC_END) $(library_include_HEADERS) \
+               bindings/swig/classes.i bindings/swig/templates.i \
+               bindings/swig/enums.i $(PDOC_START) $(PDOC_END) \
+               $(library_include_HEADERS) \
                $(nodist_library_include_HEADERS) \
                $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
                $(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:
@@ -652,11 +656,12 @@ $(JDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
        $(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS)
        $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py java $(CPPXMLDOC) > $@
 
-$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i \
+$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i \
+               bindings/swig/templates.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++ -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)
@@ -676,9 +681,9 @@ $(JLIB): $(JCXX) \
 
 java-install:
        $(INSTALL) -d $(DESTDIR)$(libdir)/jni
-       $(INSTALL) $(JLIB) -t $(DESTDIR)$(libdir)/jni
+       $(INSTALL) $(JLIB) $(DESTDIR)$(libdir)/jni
        $(INSTALL) -d $(DESTDIR)$(datadir)/java
-       $(INSTALL) $(JJAR) -t $(DESTDIR)$(datadir)/java
+       $(INSTALL) $(JJAR) $(DESTDIR)$(datadir)/java
 
 java-clean:
        -$(AM_V_at)rm -f $(java_cleanfiles)