src/std.c
# Input modules
+# src/input/binary.c \
+#
libsigrok_la_SOURCES += \
- src/input/binary.c \
+ src/input/input.c \
src/input/chronovu_la8.c \
src/input/csv.c \
- src/input/input.c \
src/input/vcd.c \
src/input/wav.c
src/hardware/openbench-logic-sniffer/protocol.c \
src/hardware/openbench-logic-sniffer/api.c
endif
+if HW_PIPISTRELLO_OLS
+libsigrok_la_SOURCES += \
+ src/hardware/pipistrello-ols/protocol.h \
+ src/hardware/pipistrello-ols/protocol.c \
+ src/hardware/pipistrello-ols/api.c
+endif
if HW_RIGOL_DS
libsigrok_la_SOURCES += \
src/hardware/rigol-ds/protocol.h \
pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
doxy/xml/index.xml: include/libsigrok/libsigrok.h
- $(AM_V_GEN)doxygen Doxyfile 2>/dev/null
+ $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null
bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrok.hpp \
bindings/cxx/enums.timestamp
- $(AM_V_GEN)cd bindings/cxx && doxygen Doxyfile 2>/dev/null
+ $(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
if BINDINGS_PYTHON
PDOC = bindings/python/sigrok/core/doc.i
$(PDOC): bindings/swig/doc.py $(CPPXMLDOC)
- $(AM_V_GEN)python bindings/swig/doc.py python $(CPPXMLDOC) > $@
+ $(AM_V_at)test -d $(PDIR)/sigrok/core || mkdir -p $(PDIR)/sigrok/core
+ $(AM_V_GEN)python $< python $(CPPXMLDOC) > $@
python-build: $(PDIR)/timestamp
python-quietclean:
- $(AM_V_at)cd $(PDIR) && python setup.py --quiet clean --all 3>&1 1>&2 2>&3 \
+ $(AM_V_at)cd $(PDIR) && python $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \
| grep -v "can.t clean it"; true
$(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \
bindings/swig/classes.i $(PDOC) $(library_include_HEADERS)
$(AM_V_at)$(MAKE) python-quietclean
- $(AM_V_GEN)cd $(PDIR) && python setup.py --quiet build 3>&1 1>&2 2>&3 \
+ $(AM_V_GEN)cd $(PDIR) && python $(abs_srcdir)/$(PDIR)/setup.py --quiet build 3>&1 1>&2 2>&3 \
| grep -v "command line option.*Wstrict-prototypes"; true
$(AM_V_at)touch $(PDIR)/timestamp
python-install:
- cd $(PDIR) && python setup.py --quiet install --prefix $(prefix)
+ cd $(PDIR) && python $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix)
python-clean:
$(AM_V_at)$(MAKE) python-quietclean
$(AM_V_at)rm -rf $(PDIR)/doxy/
python-doc:
- $(AM_V_at)cd $(PDIR) && doxygen Doxyfile 2>/dev/null
+ $(AM_V_at)cd $(srcdir)/$(PDIR) && BUILDDIR=$(abs_builddir)/$(PDIR)/ doxygen Doxyfile 2>/dev/null
BUILD_EXTRA += python-build
INSTALL_EXTRA += python-install
JPKG = org/sigrok/core
JCLS = $(JDIR)/$(JPKG)/classes
JINT = $(JDIR)/$(JPKG)/interfaces
-JSRC = $(JCLS)/*.java $(JINT)/*.java
+JSRC = $(JCLS)/*.java $(srcdir)/$(JINT)/*.java
JSWG = $(JCLS)/classes.i
JDOC = $(JCLS)/doc.i
JCXX = $(JCLS)/classes_wrap.cxx
java-build: $(JJAR) $(JLIB)
$(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
- $(AM_V_GEN)python bindings/swig/doc.py java $(CPPXMLDOC) > $@
+ $(AM_V_at)test -d $(JCLS) || mkdir -p $(JCLS)
+ $(AM_V_GEN)python $< java $(CPPXMLDOC) > $@
$(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
- -Iinclude -Ibindings/cxx/include -outdir $(JCLS) $(JSWG)
+ -I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $<
$(JJAR): $(JCXX)
- $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) $(JSRC)
+ $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)
$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
$(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
rm -rf $(JDIR)/doxy/
java-doc:
- $(AM_v_at)cd $(JDIR) && doxygen Doxyfile 2>/dev/null
+ $(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR=$(abs_builddir)/$(JDIR)/ doxygen Doxyfile 2>/dev/null
BUILD_EXTRA += java-build
INSTALL_EXTRA += java-install