## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-ACLOCAL_AMFLAGS = -I autostuff
+ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --silent
+MAKEFLAGS = --no-print-directory
-AM_CPPFLAGS = -Isrc -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+FIRMWARE_DIR = $(datadir)/sigrok-firmware
+
+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
+# Ensure that local include directories are always searched first.
+AM_CPPFLAGS = $(local_includes) -D_POSIX_C_SOURCE=200112L -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+
+# The tests CFLAGS are a superset of the libsigrok CFLAGS, and the
+# python bindings CFLAGS are a superset of the C++ bindings CFLAGS.
+AM_CFLAGS = $(SR_EXTRA_CFLAGS) $(SR_WFLAGS) $(TESTS_CFLAGS)
+AM_CXXFLAGS = $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)
lib_LTLIBRARIES = libsigrok.la
src/hwdriver.c \
src/trigger.c \
src/soft-trigger.c \
+ src/analog.c \
+ src/fallback.c \
src/strutil.c \
src/log.c \
src/version.c \
# Input modules
libsigrok_la_SOURCES += \
+ src/input/input.c \
src/input/binary.c \
src/input/chronovu_la8.c \
src/input/csv.c \
- src/input/input.c \
src/input/vcd.c \
src/input/wav.c
src/output/gnuplot.c \
src/output/hex.c \
src/output/ols.c \
+ src/output/srzip.c \
src/output/vcd.c
+# Transform modules
+libsigrok_la_SOURCES += \
+ src/transform/transform.c \
+ src/transform/nop.c \
+ src/transform/scale.c \
+ src/transform/invert.c
+
# SCPI support
libsigrok_la_SOURCES += \
src/scpi/scpi.c \
+ src/scpi/helpers.c \
src/scpi/scpi_tcp.c
if NEED_RPC
libsigrok_la_SOURCES += \
libsigrok_la_SOURCES += \
src/scpi/scpi_visa.c
endif
+if NEED_GPIB
+libsigrok_la_SOURCES += \
+ src/scpi/scpi_libgpib.c
+endif
+
+# Modbus support
+libsigrok_la_SOURCES += \
+ src/modbus/modbus.c
+if NEED_SERIAL
+libsigrok_la_SOURCES += \
+ src/modbus/modbus_serial_rtu.c
+endif
# Hardware (DMM chip parsers)
libsigrok_la_SOURCES += \
src/dmm/m2110.c \
src/dmm/metex14.c \
src/dmm/rs9lcd.c \
- src/dmm/bm25x.c
+ src/dmm/bm25x.c \
+ src/dmm/ut71x.c \
+ src/dmm/ut372.c \
+ src/dmm/vc870.c
+
+# Hardware (LCR chip parsers)
+if NEED_SERIAL
+libsigrok_la_SOURCES += \
+ src/lcr/es51919.c
+endif
+
+# Hardware (Scale protocol parsers)
+libsigrok_la_SOURCES += \
+ src/scale/kern.c
# Hardware drivers
if HW_AGILENT_DMM
src/hardware/atten-pps3xxx/protocol.c \
src/hardware/atten-pps3xxx/api.c
endif
+if HW_BAYLIBRE_ACME
+libsigrok_la_SOURCES += \
+ src/hardware/baylibre-acme/protocol.h \
+ src/hardware/baylibre-acme/protocol.c \
+ src/hardware/baylibre-acme/api.c \
+ src/hardware/baylibre-acme/gpio.h \
+ src/hardware/baylibre-acme/gpio.c
+endif
if HW_BEAGLELOGIC
libsigrok_la_SOURCES += \
src/hardware/beaglelogic/beaglelogic.h \
libsigrok_la_SOURCES += \
src/hardware/demo/demo.c
endif
+if HW_DEREE_DE5000
+libsigrok_la_SOURCES += \
+ src/hardware/deree-de5000/api.c
+endif
if HW_FLUKE_DMM
libsigrok_la_SOURCES += \
src/hardware/fluke-dmm/fluke-dmm.h \
libsigrok_la_SOURCES += \
src/hardware/fx2lafw/protocol.h \
src/hardware/fx2lafw/protocol.c \
- src/hardware/fx2lafw/api.c
+ src/hardware/fx2lafw/api.c \
+ src/hardware/fx2lafw/dslogic.c \
+ src/hardware/fx2lafw/dslogic.h
endif
if HW_GMC_MH_1X_2X
libsigrok_la_SOURCES += \
src/hardware/kecheng-kc-330b/protocol.c \
src/hardware/kecheng-kc-330b/api.c
endif
+if HW_KERN_SCALE
+libsigrok_la_SOURCES += \
+ src/hardware/kern-scale/protocol.h \
+ src/hardware/kern-scale/protocol.c \
+ src/hardware/kern-scale/api.c
+endif
if HW_LASCAR_EL_USB
libsigrok_la_SOURCES += \
src/hardware/lascar-el-usb/protocol.h \
src/hardware/manson-hcs-3xxx/protocol.c \
src/hardware/manson-hcs-3xxx/api.c
endif
+if HW_MAYNUO_M97
+libsigrok_la_SOURCES += \
+ src/hardware/maynuo-m97/protocol.h \
+ src/hardware/maynuo-m97/protocol.c \
+ src/hardware/maynuo-m97/api.c
+endif
if HW_MIC_985XX
libsigrok_la_SOURCES += \
src/hardware/mic-985xx/protocol.h \
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 \
src/hardware/saleae-logic16/protocol.c \
src/hardware/saleae-logic16/api.c
endif
+if HW_SCPI_PPS
+libsigrok_la_SOURCES += \
+ src/hardware/scpi-pps/protocol.h \
+ src/hardware/scpi-pps/protocol.c \
+ src/hardware/scpi-pps/profiles.c \
+ src/hardware/scpi-pps/api.c
+endif
if HW_SERIAL_DMM
libsigrok_la_SOURCES += \
src/hardware/serial-dmm/protocol.h \
src/hardware/victor-dmm/protocol.c \
src/hardware/victor-dmm/api.c
endif
+if HW_YOKOGAWA_DLM
+libsigrok_la_SOURCES += \
+ src/hardware/yokogawa-dlm/protocol.h \
+ src/hardware/yokogawa-dlm/protocol.c \
+ src/hardware/yokogawa-dlm/protocol_wrappers.h \
+ src/hardware/yokogawa-dlm/protocol_wrappers.c \
+ src/hardware/yokogawa-dlm/api.c
+endif
if HW_ZEROPLUS_LOGIC_CUBE
libsigrok_la_SOURCES += \
src/hardware/zeroplus-logic-cube/analyzer.c \
src/hardware/zeroplus-logic-cube/api.c
endif
-libsigrok_la_LIBADD = $(LIBOBJS)
-
-libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS)
+libsigrok_la_LIBADD = $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
+libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
library_includedir = $(includedir)/libsigrok
library_include_HEADERS = \
include/libsigrok/libsigrok.h \
- include/libsigrok/proto.h \
+ include/libsigrok/proto.h
+nodist_library_include_HEADERS = \
include/libsigrok/version.h
noinst_HEADERS = src/libsigrok-internal.h
Doxyfile \
HACKING \
README.devices \
+ bindings/cxx/ConfigKey_methods.cpp \
+ bindings/cxx/ConfigKey_methods.hpp \
+ bindings/cxx/ConfigKey_methods.i \
+ bindings/cxx/Doxyfile \
+ bindings/cxx/QuantityFlag_methods.cpp \
+ bindings/cxx/QuantityFlag_methods.hpp \
+ bindings/cxx/enums.py \
+ bindings/python/Doxyfile \
+ bindings/python/setup.py \
+ bindings/python/sigrok/__init__.py \
+ bindings/python/sigrok/core/__init__.py \
+ bindings/python/sigrok/core/classes.i \
+ bindings/java/Doxyfile \
+ 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 \
contrib/gnuplot_rigol_ds1xx2.gpi \
contrib/gnuplot_usbeesx.gpi \
contrib/z60_libsigrok.rules
if HAVE_CHECK
-
-TESTS = tests/check_main
-
+TESTS = tests/main
check_PROGRAMS = ${TESTS}
+endif
-tests_check_main_SOURCES = \
+tests_main_SOURCES = \
include/libsigrok/libsigrok.h \
tests/lib.c \
tests/lib.h \
- tests/check_main.c \
- tests/check_core.c \
- tests/check_input_all.c \
- tests/check_input_binary.c \
- tests/check_output_all.c \
- tests/check_strutil.c \
- tests/check_version.c \
- tests/check_driver_all.c
-
-tests_check_main_CFLAGS = @check_CFLAGS@
-
-tests_check_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@
-
-endif
+ tests/main.c \
+ tests/core.c \
+ tests/input_all.c \
+ tests/input_binary.c \
+ tests/output_all.c \
+ tests/transform_all.c \
+ tests/session.c \
+ tests/strutil.c \
+ tests/version.c \
+ tests/driver_all.c \
+ tests/device.c \
+ tests/trigger.c
+
+tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
BUILD_EXTRA =
INSTALL_EXTRA =
if BINDINGS_CXX
-lib_LTLIBRARIES += bindings/cxx/libsigrokxx.la
-
-bindings_cxx_libsigrokxx_la_SOURCES = bindings/cxx/classes.cpp
+lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la
-bindings_cxx_libsigrokxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
+bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp
-bindings_cxx_libsigrokxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
+bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(SR_EXTRA_LIBS) $(LIBSIGROKCXX_LIBS)
+bindings_cxx_libsigrokcxx_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
-library_include_HEADERS += \
- bindings/cxx/include/libsigrok/libsigrok.hpp \
- bindings/cxx/include/libsigrok/enums.hpp
+bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
+bindings_cxx_libsigrokcxx_la_include_HEADERS = \
+ bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
+nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS = \
+ bindings/cxx/include/libsigrokcxx/enums.hpp
-pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
+pkgconfig_DATA += bindings/cxx/libsigrokcxx.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/swig/enums.i: bindings/cxx/enums.timestamp
bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
+bindings/cxx/include/libsigrokcxx/enums.hpp: bindings/cxx/enums.timestamp
-bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp
-
-bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \
+bindings/cxx/enums.timestamp: $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml \
bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp
- $(AM_V_GEN)python $< doxy/xml/index.xml
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml
$(AM_V_at)touch $@
bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \
- $(library_include_HEADERS)
+ $(library_include_HEADERS) $(nodist_library_include_HEADERS)
cxx-clean:
rm -rf doxy/
rm -rf bindings/cxx/doxy/
rm -f bindings/cxx/enums.cpp
- rm -f bindings/cxx/include/libsigrok/enums.hpp
+ rm -f bindings/cxx/include/libsigrokcxx/enums.hpp
rm -f bindings/cxx/enums.timestamp
CLEAN_EXTRA += cxx-clean
CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
-$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrok.hpp \
+$(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.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
PDIR = 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) > $@
+setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)'
+setup_quiet = --quiet
+setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)
-python-build: $(PDIR)/timestamp
+$(PDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+ $(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py python $(CPPXMLDOC) > $@
-python-quietclean:
- $(AM_V_at)cd $(PDIR) && python setup.py --quiet clean --all 3>&1 1>&2 2>&3 \
- | grep -v "can.t clean it"; true
+python-build: $(PDIR)/timestamp
-$(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 \
- | grep -v "command line option.*Wstrict-prototypes"; true
- $(AM_V_at)touch $(PDIR)/timestamp
+$(PDIR)/timestamp: bindings/cxx/libsigrokcxx.la $(PDIR)/sigrok/core/classes.i \
+ bindings/swig/classes.i bindings/swig/enums.i $(PDOC) \
+ $(library_include_HEADERS) $(nodist_library_include_HEADERS)
+ $(AM_V_at)$(setup_py) clean --all 2>/dev/null
+ $(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" build_py
+ $(AM_V_at): >$@
python-install:
- cd $(PDIR) && python setup.py --quiet install --prefix $(prefix)
+ $(AM_V_at)$(MKDIR_P) "$(DESTDIR)$(prefix)" "$(DESTDIR)$(exec_prefix)"
+ $(setup_py) install --root "$(DESTDIR)/" --prefix "$(prefix)" --exec-prefix "$(exec_prefix)"
python-clean:
- $(AM_V_at)$(MAKE) python-quietclean
- $(AM_V_at)rm -f $(PDIR)/timestamp
- $(AM_V_at)rm -rf $(PDIR)/doxy/
+ -$(AM_V_at)rm -f $(PDIR)/timestamp
+ -$(AM_V_at)rm -fr $(PDIR)/doxy
+ -$(AM_V_at)$(setup_py) clean --all 2>/dev/null
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
JLIB = $(JDIR)/libsigrok_java_core_classes.so
JJAR = $(JDIR)/sigrok-core.jar
+java_cleanfiles = $(JCXX) $(JCLS)/*.java $(JCLS)/*.class $(JINT)/*.class $(JJAR) $(JLIB)
+
java-build: $(JJAR) $(JLIB)
-$(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
- $(AM_V_GEN)python bindings/swig/doc.py java $(CPPXMLDOC) > $@
+$(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): $(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)
+$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i \
+ $(library_include_HEADERS) $(nodist_library_include_HEADERS)
+ -$(AM_V_at)rm -f $(java_cleanfiles)
+ $(AM_V_GEN)$(SWIG) -c++ -java -package org.sigrok.core.classes \
+ -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
+ -outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)
$(JJAR): $(JCXX)
- $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) $(JSRC)
+ $(AM_V_GEN)$(JAVAC) -d $(JDIR) $(JSRC)
$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
-$(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
- $(AM_V_GEN)$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
+$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS) $(nodist_library_include_HEADERS)
+ $(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \
-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
- -lsigrokxx -o $(JLIB)
+ -lsigrokcxx $(LIBSIGROKCXX_LIBS) -o $(JLIB)
java-install:
- $(INSTALL) -d $(libdir)/jni
- $(INSTALL) $(JLIB) -t $(libdir)/jni
- $(INSTALL) -d $(datadir)/java
- $(INSTALL) $(JJAR) -t $(datadir)/java
+ $(INSTALL) -d $(DESTDIR)$(libdir)/jni
+ $(INSTALL) $(JLIB) -t $(DESTDIR)$(libdir)/jni
+ $(INSTALL) -d $(DESTDIR)$(datadir)/java
+ $(INSTALL) $(JJAR) -t $(DESTDIR)$(datadir)/java
java-clean:
- rm -f $(JCXX)
- rm -f $(JCLS)/*.java
- rm -f $(JCLS)/*.class
- rm -f $(JINT)/*.class
- rm -f $(JJAR)
- rm -f $(JLIB)
- rm -rf $(JDIR)/doxy/
+ -$(AM_V_at)rm -f $(java_cleanfiles)
+ -$(AM_V_at)rm -fr $(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
BUILD_EXTRA += java-build
INSTALL_EXTRA += java-install
projects / libsigrok.git / blobdiff