X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=Makefile.am;h=665622e3a6a490bc385e88c42dde65f79cf049ca;hp=2f56b49a8fbc4322e3573112b4c6b627cd5a44ce;hb=5a3e34285da1544941fd314079f05a1715fc3de3;hpb=b9d530920fa97ab92d5f78f6f00a1ffc73259f2f diff --git a/Makefile.am b/Makefile.am index 2f56b49a..665622e3 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 \ @@ -116,7 +127,8 @@ libsigrok_la_SOURCES += \ src/dmm/rs9lcd.c \ src/dmm/bm25x.c \ src/dmm/ut71x.c \ - src/dmm/ut372.c + src/dmm/ut372.c \ + src/dmm/vc870.c # Hardware (LCR chip parsers) if NEED_SERIAL @@ -276,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 \ @@ -398,10 +416,13 @@ 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 \ - include/libsigrok/proto.h \ + include/libsigrok/proto.h +nodist_library_include_HEADERS = \ include/libsigrok/version.h noinst_HEADERS = src/libsigrok-internal.h @@ -412,6 +433,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 \ @@ -463,9 +503,12 @@ 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 \ + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS = \ bindings/cxx/include/libsigrokcxx/enums.hpp pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc @@ -473,8 +516,8 @@ pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc doxy/xml/index.xml: include/libsigrok/libsigrok.h $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null +bindings/swig/enums.i: bindings/cxx/enums.timestamp bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp - bindings/cxx/include/libsigrokcxx/enums.hpp: bindings/cxx/enums.timestamp bindings/cxx/enums.timestamp: $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml \ @@ -483,7 +526,7 @@ bindings/cxx/enums.timestamp: $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml $(AM_V_at)touch $@ bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \ - $(library_include_HEADERS) + $(library_include_HEADERS) $(nodist_library_include_HEADERS) cxx-clean: rm -rf doxy/ @@ -518,7 +561,8 @@ python-quietclean: | grep -v "can.t clean it"; true $(PDIR)/timestamp: bindings/cxx/libsigrokcxx.la $(PDIR)/sigrok/core/classes.i \ - bindings/swig/classes.i $(PDOC) $(library_include_HEADERS) + bindings/swig/classes.i bindings/swig/enums.i $(PDOC) \ + $(library_include_HEADERS) $(nodist_library_include_HEADERS) $(AM_V_at)$(MAKE) python-quietclean $(AM_V_GEN)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet build 3>&1 1>&2 2>&3 \ | grep -v "command line option.*Wstrict-prototypes"; true @@ -563,25 +607,26 @@ $(JDOC): bindings/swig/doc.py $(CPPXMLDOC) $(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS) $(AM_V_GEN)python $< java $(CPPXMLDOC) > $@ -$(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS) +$(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i \ + $(library_include_HEADERS) $(nodist_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 $@ $< + -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) -outdir $(JCLS) -o $@ $< $(JJAR): $(JCXX) $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC) $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG) -$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS) +$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS) $(nodist_library_include_HEADERS) $(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \ -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \ -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)