AM_LIBTOOLFLAGS = --silent
GNUMAKEFLAGS = --no-print-directory
+# distutils/setuptools cause trouble on distcheck. Disable for now.
+DISTCHECK_CONFIGURE_FLAGS = --disable-python
+
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) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+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.
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.h \
src/scpi/scpi.c \
src/scpi/helpers.c \
src/scpi/scpi_tcp.c
src/dmm/bm25x.c \
src/dmm/ut71x.c \
src/dmm/ut372.c \
- src/dmm/vc870.c
+ src/dmm/vc870.c \
+ src/dmm/dtm0660.c
# Hardware (LCR chip parsers)
if NEED_SERIAL
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 += \
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/kern-scale/protocol.c \
src/hardware/kern-scale/api.c
endif
+if HW_KORAD_KAXXXXP
+libsigrok_la_SOURCES += \
+ src/hardware/korad-kaxxxxp/protocol.h \
+ src/hardware/korad-kaxxxxp/protocol.c \
+ src/hardware/korad-kaxxxxp/api.c
+endif
if HW_LASCAR_EL_USB
libsigrok_la_SOURCES += \
src/hardware/lascar-el-usb/protocol.h \
src/hardware/lascar-el-usb/protocol.c \
src/hardware/lascar-el-usb/api.c
endif
+if HW_LECROY_LOGICSTUDIO
+libsigrok_la_SOURCES += \
+ src/hardware/lecroy-logicstudio/protocol.h \
+ src/hardware/lecroy-logicstudio/protocol.c \
+ src/hardware/lecroy-logicstudio/api.c
+endif
if HW_MANSON_HCS_3XXX
libsigrok_la_SOURCES += \
src/hardware/manson-hcs-3xxx/protocol.h \
libsigrok_la_SOURCES += \
src/hardware/sysclk-lwla/lwla.h \
src/hardware/sysclk-lwla/lwla.c \
+ src/hardware/sysclk-lwla/lwla1016.c \
+ src/hardware/sysclk-lwla/lwla1034.c \
src/hardware/sysclk-lwla/protocol.h \
src/hardware/sysclk-lwla/protocol.c \
src/hardware/sysclk-lwla/api.c
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 \
+ bindings/swig/templates.i \
contrib/gnuplot_chronovu_la8.gpi \
contrib/gnuplot_rigol_ds1xx2.gpi \
contrib/gnuplot_usbeesx.gpi \
tests/version.c \
tests/driver_all.c \
tests/device.c \
- tests/trigger.c
+ tests/trigger.c \
+ tests/analog.c
tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
BUILD_EXTRA =
INSTALL_EXTRA =
+UNINSTALL_EXTRA =
CLEAN_EXTRA =
if BINDINGS_CXX
cxx-clean:
rm -rf doxy/
rm -rf bindings/cxx/doxy/
+ rm -f bindings/swig/enums.i
rm -f bindings/cxx/enums.cpp
rm -f bindings/cxx/include/libsigrokcxx/enums.hpp
rm -f bindings/cxx/enums.timestamp
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 = bindings/python/sigrok/core/doc.i
+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)
-$(PDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+$(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 > $@
+
+$(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) > $@
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py python $(CPPXMLDOC) end > $@
python-build: $(PDIR)/timestamp
$(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
- bindings/swig/classes.i bindings/swig/enums.i $(PDOC) \
- $(library_include_HEADERS) $(nodist_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:
$(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++ -java -package org.sigrok.core.classes \
+ $(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)
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-uninstall:
+ -rm -f $(DESTDIR)$(datadir)/java/sigrok-core.jar
+ -rm -f $(DESTDIR)$(libdir)/jni/libsigrok_java_core_classes.so
java-clean:
- -$(AM_V_at)rm -f $(java_cleanfiles)
+ -$(AM_V_at)rm -f $(java_cleanfiles) $(JDOC)
-$(AM_V_at)rm -fr $(JDIR)/doxy
java-doc:
BUILD_EXTRA += java-build
INSTALL_EXTRA += java-install
+UNINSTALL_EXTRA += java-uninstall
CLEAN_EXTRA += java-clean
endif
all-local: $(BUILD_EXTRA)
install-exec-local: $(INSTALL_EXTRA)
+uninstall-local: $(UNINSTALL_EXTRA)
clean-local: $(CLEAN_EXTRA)
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: dist-changelog
-.PHONY: ChangeLog
-ChangeLog:
- git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+dist-hook: dist-changelog
-dist-hook: ChangeLog
+dist-changelog:
+ $(AM_V_at)if test ! -d '$(top_srcdir)/.git'; then \
+ cp -f '$(top_srcdir)/ChangeLog' "$(top_distdir)/ChangeLog"; \
+ elif git -C '$(top_srcdir)' log >.ChangeLog.tmp; then \
+ mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
+ else \
+ rm -f .ChangeLog.tmp; exit 1; \
+ fi
projects / libsigrok.git / blobdiff