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

diff --git a/Makefile.am b/Makefile.am
index bf980c22..a020af4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,10 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
+local_includes += -Ibindings/cxx/include -I${srcdir}/bindings/cxx/include -Ibindings/cxx
+
+AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -106,6 +109,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 +288,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 +416,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 \
@@ -413,6 +432,25 @@ EXTRA_DIST = \
 	Doxyfile \
 	HACKING \
 	README.devices \
+	bindings/cxx/ConfigKey_methods.cpp \
+	bindings/cxx/ConfigKey_methods.hpp \
+	bindings/cxx/ConfigKey_methods.i \
+	bindings/cxx/Doxyfile \
+	bindings/cxx/QuantityFlag_methods.cpp \
+	bindings/cxx/QuantityFlag_methods.hpp \
+	bindings/cxx/enums.py \
+	bindings/python/Doxyfile \
+	bindings/python/setup.py \
+	bindings/python/sigrok/__init__.py \
+	bindings/python/sigrok/core/__init__.py \
+	bindings/python/sigrok/core/classes.i \
+	bindings/java/Doxyfile \
+	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 \
 	contrib/gnuplot_chronovu_la8.gpi \
 	contrib/gnuplot_rigol_ds1xx2.gpi \
 	contrib/gnuplot_usbeesx.gpi \
@@ -464,6 +502,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 \
@@ -567,7 +607,7 @@ $(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
 $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
 	$(AM_V_at)make java-clean
 	$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
-		-I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $<
+		$(local_includes) -I$(JCLS) -I. -I$(srcdir) -outdir $(JCLS) -o $@ $<
 
 $(JJAR): $(JCXX)
 	$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)
@@ -579,10 +619,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)