Fix #550 by allowing an empty trigger match list

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 95190567b06d0e37e18c50fffe6df78b6b5f09cc..315e322c2a31b7c492dd0fc696d8c46161ed4f9b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --silent
-MAKEFLAGS = --no-print-directory
 
 FIRMWARE_DIR = $(datadir)/sigrok-firmware
 
@@ -31,9 +30,9 @@ endif
 # Ensure that local include directories are always searched first.
 AM_CPPFLAGS = $(local_includes) -D_POSIX_C_SOURCE=200112L -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
-# The check CFLAGS are a superset of the libsigrok CFLAGS, and the
+# 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) $(CHECK_CFLAGS)
+AM_CFLAGS = $(SR_EXTRA_CFLAGS) $(SR_WFLAGS) $(TESTS_CFLAGS)
 AM_CXXFLAGS = $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)
 
 lib_LTLIBRARIES = libsigrok.la
@@ -92,6 +91,7 @@ libsigrok_la_SOURCES += \
 # SCPI support
 libsigrok_la_SOURCES += \
        src/scpi/scpi.c \
+       src/scpi/helpers.c \
        src/scpi/scpi_tcp.c
 if NEED_RPC
 libsigrok_la_SOURCES += \
@@ -147,6 +147,10 @@ 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
 libsigrok_la_SOURCES += \
@@ -287,6 +291,12 @@ 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 \
@@ -469,10 +479,9 @@ EXTRA_DIST = \
        contrib/z60_libsigrok.rules
 
 if HAVE_CHECK
-
 TESTS = tests/main
-
 check_PROGRAMS = ${TESTS}
+endif
 
 tests_main_SOURCES = \
        include/libsigrok/libsigrok.h \
@@ -491,9 +500,7 @@ tests_main_SOURCES = \
        tests/device.c \
        tests/trigger.c
 
-tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(CHECK_LIBS)
-
-endif
+tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
 
 BUILD_EXTRA =
 INSTALL_EXTRA =
@@ -553,7 +560,9 @@ if BINDINGS_PYTHON
 PDIR = bindings/python
 PDOC = bindings/python/sigrok/core/doc.i
 
-setup_py = cd $(PDIR) && $(PYTHON) "$(abs_srcdir)/$(PDIR)/setup.py" --quiet
+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)
 
 $(PDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
        $(AM_V_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core
@@ -570,12 +579,13 @@ $(PDIR)/timestamp: bindings/cxx/libsigrokcxx.la $(PDIR)/sigrok/core/classes.i \
 
 python-install:
        $(AM_V_at)$(MKDIR_P) "$(DESTDIR)$(prefix)" "$(DESTDIR)$(exec_prefix)"
-       $(setup_py) install --root "$(DESTDIR)/" --prefix "$(prefix)" --exec-prefix "$(exec_prefix)"
+       destdir='$(DESTDIR)'; $(setup_py) install $${destdir:+"--root=$$destdir"} \
+               --prefix "$(prefix)" --exec-prefix "$(exec_prefix)"
 
 python-clean:
-       -$(AM_V_at)$(setup_py) clean --all 2>/dev/null
        -$(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