X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=5f1602f5aad927bd3d6629f860f9e18dc59ab8b9;hb=1f61c22ff5e0d1d169894ad606831b44fde19468;hp=9ea9788c34177cfd9f53eb6aca35b8ef7ea5c588;hpb=a7d7f93c1ba6f08c243b894dda29b8ac0349bf10;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index 9ea9788c..5f1602f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,17 @@ ACLOCAL_AMFLAGS = -I autostuff -AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' +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 +endif +# Ensure that local include directories are always searched first. +AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' + +# The check 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) lib_LTLIBRARIES = libsigrok.la @@ -106,6 +116,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 +134,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 @@ -225,7 +244,8 @@ libsigrok_la_SOURCES += \ src/hardware/fx2lafw/protocol.h \ src/hardware/fx2lafw/protocol.c \ src/hardware/fx2lafw/api.c \ - src/hardware/fx2lafw/dslogic.c + src/hardware/fx2lafw/dslogic.c \ + src/hardware/fx2lafw/dslogic.h endif if HW_GMC_MH_1X_2X libsigrok_la_SOURCES += \ @@ -275,6 +295,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,14 +419,14 @@ libsigrok_la_SOURCES += \ src/hardware/zeroplus-logic-cube/api.c endif -libsigrok_la_LIBADD = $(LIBOBJS) - -libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS) +libsigrok_la_LIBADD = $(LIBSIGROK_LIBS) +libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -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 @@ -411,6 +437,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 \ @@ -442,9 +487,7 @@ tests_main_SOURCES = \ tests/device.c \ tests/trigger.c -tests_main_CFLAGS = @check_CFLAGS@ - -tests_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@ +tests_main_LDADD = libsigrok.la $(CHECK_LIBS) endif @@ -458,13 +501,13 @@ lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp -bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS) - -bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS) +bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(LIBSIGROKCXX_LIBS) +bindings_cxx_libsigrokcxx_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -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 @@ -472,8 +515,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 \ @@ -482,7 +525,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/ @@ -517,7 +560,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 @@ -562,25 +606,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) $(JNI_CPPFLAGS) -outdir $(JCLS) -o $@ $< $(JJAR): $(JCXX) - $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC) + $(AM_V_GEN)$(JAVAC) -d $(JDIR) $(JSRC) $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG) -$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS) - $(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \ +$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS) $(nodist_library_include_HEADERS) + $(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \ -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \ - -lsigrokcxx -o $(JLIB) + -lsigrokcxx $(LIBSIGROKCXX_LIBS) -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)