## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-ACLOCAL_AMFLAGS = -I autostuff
+ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --silent
+GNUMAKEFLAGS = --no-print-directory
-AM_CPPFLAGS = -I$(srcdir)/src -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
+# Do not hard-code the firmware location on Windows.
+if WIN32
+global_defs =
+else
+global_defs = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+endif
+# Ensure that local include directories are always searched first.
+AM_CPPFLAGS = $(local_includes) $(global_defs)
+
+# 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/soft-trigger.c \
src/analog.c \
src/fallback.c \
+ src/resource.c \
src/strutil.c \
src/log.c \
src/version.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 += \
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/es519xx.c \
src/dmm/metex14.c \
src/dmm/rs9lcd.c \
src/dmm/bm25x.c \
- src/dmm/ut71x.c
+ src/dmm/ut71x.c \
+ src/dmm/ut372.c \
+ src/dmm/vc870.c
# Hardware (LCR chip parsers)
if NEED_SERIAL
src/lcr/es51919.c
endif
+# Hardware (Scale protocol parsers)
+libsigrok_la_SOURCES += \
+ src/scale/kern.c
+
# Hardware drivers
if HW_AGILENT_DMM
libsigrok_la_SOURCES += \
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/gmc-mh-1x-2x/protocol.c \
src/hardware/gmc-mh-1x-2x/api.c
endif
+if HW_GWINSTEK_GDS_800
+libsigrok_la_SOURCES += \
+ src/hardware/gwinstek-gds-800/protocol.h \
+ src/hardware/gwinstek-gds-800/protocol.c \
+ src/hardware/gwinstek-gds-800/api.c
+endif
if HW_HAMEG_HMO
libsigrok_la_SOURCES += \
src/hardware/hameg-hmo/protocol.h \
src/hardware/hantek-dso/dso.c \
src/hardware/hantek-dso/api.c
endif
+if HW_HUNG_CHANG_DSO_2100
+libsigrok_la_SOURCES += \
+ src/hardware/hung-chang-dso-2100/protocol.h \
+ src/hardware/hung-chang-dso-2100/protocol.c \
+ src/hardware/hung-chang-dso-2100/api.c
+endif
if HW_IKALOGIC_SCANALOGIC2
libsigrok_la_SOURCES += \
src/hardware/ikalogic-scanalogic2/protocol.h \
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_KORAD_KDXXXXP
+libsigrok_la_SOURCES += \
+ src/hardware/korad-kdxxxxp/protocol.h \
+ src/hardware/korad-kdxxxxp/protocol.c \
+ src/hardware/korad-kdxxxxp/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/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/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_transform_all.c \
- tests/check_session.c \
- tests/check_strutil.c \
- tests/check_version.c \
- tests/check_driver_all.c \
- tests/check_device.c \
- tests/check_trigger.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/analog.c
+
+tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
BUILD_EXTRA =
INSTALL_EXTRA =
bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp
-bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
-
-bindings_cxx_libsigrokcxx_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
bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
bindings_cxx_libsigrokcxx_la_include_HEADERS = \
- bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
+ bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
+nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS = \
bindings/cxx/include/libsigrokcxx/enums.hpp
pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
doxy/xml/index.xml: include/libsigrok/libsigrok.h
$(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/enums.timestamp: $(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/
if BINDINGS_PYTHON
PDIR = bindings/python
-PDOC = bindings/python/sigrok/core/doc.i
+PDOC_START = bindings/python/sigrok/core/doc_start.i
+PDOC_END = bindings/python/sigrok/core/doc_end.i
-$(PDOC): bindings/swig/doc.py $(CPPXMLDOC)
- $(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core
- $(AM_V_GEN)$(PYTHON) $< python $(CPPXMLDOC) > $@
-
-python-build: $(PDIR)/timestamp
+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-quietclean:
- $(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
+$(PDOC_START): $(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) start > $@
-$(PDIR)/timestamp: bindings/cxx/libsigrokcxx.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) $(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
+$(PDOC_END): $(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) end > $@
-$(DESTDIR)$(prefix):
- $(MKDIR_P) $@
+python-build: $(PDIR)/timestamp
-python-install: $(DESTDIR)$(prefix)
- cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix) `test "$(DESTDIR)" && echo --root=$(DESTDIR)`
+$(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
+ bindings/swig/classes.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_at): >$@
+
+python-install:
+ $(AM_V_at)$(MKDIR_P) "$(DESTDIR)$(prefix)" "$(DESTDIR)$(exec_prefix)"
+ destdir='$(DESTDIR)'; $(setup_py) install $${destdir:+"--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 $(srcdir)/$(PDIR) && BUILDDIR=$(abs_builddir)/$(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
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)
+$(JDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
$(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS)
- $(AM_V_GEN)python $< java $(CPPXMLDOC) > $@
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py java $(CPPXMLDOC) > $@
-$(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
- $(AM_V_at)make java-clean
- $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
- -I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $<
+$(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++ -Dnoexcept= -Dprivate=protected \
+ -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) -d $(JDIR) $(JSRC)
+ $(AM_V_GEN)$(JAVAC) -d $(JDIR) $(JSRC)
$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
-$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS)
- $(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \
+$(JLIB): $(JCXX) \
+ $(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_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \
-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
- -lsigrokcxx -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:
- $(AM_V_at)rm -f $(JCXX)
- $(AM_V_at)rm -f $(JCLS)/*.java
- $(AM_V_at)rm -f $(JCLS)/*.class
- $(AM_V_at)rm -f $(JINT)/*.class
- $(AM_V_at)rm -f $(JJAR)
- $(AM_V_at)rm -f $(JLIB)
- $(AM_V_at)rm -rf $(JDIR)/doxy/
+ -$(AM_V_at)rm -f $(java_cleanfiles)
+ -$(AM_V_at)rm -fr $(JDIR)/doxy
java-doc:
- $(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR=$(abs_builddir)/$(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
.PHONY: ChangeLog
ChangeLog:
- git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+ git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@
dist-hook: ChangeLog
projects / libsigrok.git / blobdiff