X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=3e2388982bd03ab9e70d3529040dbf92ad975161;hb=3cd4b381744eb88fd4ba32565bd408c33b431629;hp=bf980c22bca7f637c92c5178b897ec8effe9d397;hpb=c36f78f7728e8b5263bed440530a61caa6e30a26;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index bf980c22..3e238898 100644
--- 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 \
@@ -277,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 \
@@ -399,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 \
@@ -464,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 \
@@ -579,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)