Add filename field to sr_output and make it accessible

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 98e1f74e1c0ed00c9f4dfd8aae44c8f4018fc992..3e2388982bd03ab9e70d3529040dbf92ad975161 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,14 @@ 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 \
@@ -115,7 +123,9 @@ libsigrok_la_SOURCES += \
        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
@@ -151,7 +161,9 @@ 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/api.c \
+       src/hardware/baylibre-acme/gpio.h \
+       src/hardware/baylibre-acme/gpio.c
 endif
 if HW_BEAGLELOGIC
 libsigrok_la_SOURCES += \
@@ -221,7 +233,9 @@ if HW_FX2LAFW
 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 += \
@@ -271,6 +285,12 @@ libsigrok_la_SOURCES += \
        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 \
@@ -393,6 +413,8 @@ libsigrok_la_LIBADD = $(LIBOBJS)
 
 libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
+libsigrok_la_LDFLAGS += -no-undefined
+
 library_includedir = $(includedir)/libsigrok
 library_include_HEADERS = \
        include/libsigrok/libsigrok.h \
@@ -417,30 +439,30 @@ EXTRA_DIST = \
 
 if HAVE_CHECK
 
-TESTS = tests/check_main
+TESTS = tests/main
 
 check_PROGRAMS = ${TESTS}
 
-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/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_check_main_CFLAGS = @check_CFLAGS@
+tests_main_CFLAGS = @check_CFLAGS@
 
-tests_check_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@
+tests_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@
 
 endif
 
@@ -458,6 +480,8 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 
 bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
+bindings_cxx_libsigrokcxx_la_LDFLAGS += -no-undefined
+
 bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
 bindings_cxx_libsigrokcxx_la_include_HEADERS = \
        bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
@@ -573,10 +597,10 @@ $(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS)
                -lsigrokcxx -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)