session.c: Fix key order.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b9ac8d8404f4f607692311a205c6f8cd560a22b5..d2447c651ea36dfff2d3c28ab6f0f7454a124724 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,18 +19,22 @@
 ##
 
 ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --silent
+MAKEFLAGS = --no-print-directory
+
+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
+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) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+AM_CPPFLAGS = $(local_includes) -D_DEFAULT_SOURCE -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 = $(CHECK_CFLAGS)
-AM_CXXFLAGS = $(PYSIGROK_CFLAGS)
+AM_CFLAGS = $(SR_EXTRA_CFLAGS) $(SR_WFLAGS) $(TESTS_CFLAGS)
+AM_CXXFLAGS = $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -88,6 +92,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 += \
@@ -143,6 +148,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 += \
@@ -283,6 +292,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 \
@@ -419,7 +434,7 @@ libsigrok_la_SOURCES += \
        src/hardware/zeroplus-logic-cube/api.c
 endif
 
-libsigrok_la_LIBADD = $(LIBSIGROK_LIBS)
+libsigrok_la_LIBADD = $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
 libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
 
 library_includedir = $(includedir)/libsigrok
@@ -465,10 +480,9 @@ EXTRA_DIST = \
        contrib/z60_libsigrok.rules
 
 if HAVE_CHECK
-
 TESTS = tests/main
-
 check_PROGRAMS = ${TESTS}
+endif
 
 tests_main_SOURCES = \
        include/libsigrok/libsigrok.h \
@@ -487,9 +501,7 @@ tests_main_SOURCES = \
        tests/device.c \
        tests/trigger.c
 
-tests_main_LDADD = libsigrok.la $(CHECK_LIBS)
-
-endif
+tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
 
 BUILD_EXTRA =
 INSTALL_EXTRA =
@@ -501,7 +513,7 @@ lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la
 
 bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp
 
-bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(LIBSIGROKCXX_LIBS)
+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