X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=7b67a9a5e4a408394427cd65aef57789e25dd384;hb=3250d8c7e05f2d6a3ffbdf2499af8a13fa99fe39;hp=51c091fa8fb23243e3913a5928806c9aaed0fef5;hpb=7db0639495cb8d96aadcd17678a535c97449a677;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index 51c091fa..7b67a9a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,12 +42,11 @@ libsigrok_la_SOURCES = \ src/std.c # Input modules -# src/input/binary.c \ -# src/input/chronovu_la8.c \ -# src/input/csv.c \ -# libsigrok_la_SOURCES += \ src/input/input.c \ + src/input/binary.c \ + src/input/chronovu_la8.c \ + src/input/csv.c \ src/input/vcd.c \ src/input/wav.c @@ -64,6 +63,7 @@ libsigrok_la_SOURCES += \ src/output/gnuplot.c \ src/output/hex.c \ src/output/ols.c \ + src/output/srzip.c \ src/output/vcd.c # SCPI support @@ -92,6 +92,10 @@ if NEED_VISA libsigrok_la_SOURCES += \ src/scpi/scpi_visa.c endif +if NEED_GPIB +libsigrok_la_SOURCES += \ + src/scpi/scpi_libgpib.c +endif # Hardware (DMM chip parsers) libsigrok_la_SOURCES += \ @@ -101,7 +105,14 @@ libsigrok_la_SOURCES += \ src/dmm/m2110.c \ src/dmm/metex14.c \ src/dmm/rs9lcd.c \ - src/dmm/bm25x.c + src/dmm/bm25x.c \ + src/dmm/ut71x.c + +# Hardware (LCR chip parsers) +if HW_DEREE_DE5000 +libsigrok_la_SOURCES += \ + src/lcr/es51919.c +endif # Hardware drivers if HW_AGILENT_DMM @@ -181,6 +192,10 @@ if HW_DEMO libsigrok_la_SOURCES += \ src/hardware/demo/demo.c endif +if HW_DEREE_DE5000 +libsigrok_la_SOURCES += \ + src/hardware/deree-de5000/api.c +endif if HW_FLUKE_DMM libsigrok_la_SOURCES += \ src/hardware/fluke-dmm/fluke-dmm.h \ @@ -283,6 +298,13 @@ libsigrok_la_SOURCES += \ src/hardware/saleae-logic16/protocol.c \ src/hardware/saleae-logic16/api.c endif +if HW_SCPI_PPS +libsigrok_la_SOURCES += \ + src/hardware/scpi-pps/protocol.h \ + src/hardware/scpi-pps/protocol.c \ + src/hardware/scpi-pps/profiles.c \ + src/hardware/scpi-pps/api.c +endif if HW_SERIAL_DMM libsigrok_la_SOURCES += \ src/hardware/serial-dmm/protocol.h \ @@ -333,6 +355,14 @@ libsigrok_la_SOURCES += \ src/hardware/victor-dmm/protocol.c \ src/hardware/victor-dmm/api.c endif +if HW_YOKOGAWA_DLM +libsigrok_la_SOURCES += \ + src/hardware/yokogawa-dlm/protocol.h \ + src/hardware/yokogawa-dlm/protocol.c \ + src/hardware/yokogawa-dlm/protocol_wrappers.h \ + src/hardware/yokogawa-dlm/protocol_wrappers.c \ + src/hardware/yokogawa-dlm/api.c +endif if HW_ZEROPLUS_LOGIC_CUBE libsigrok_la_SOURCES += \ src/hardware/zeroplus-logic-cube/analyzer.c \ @@ -388,7 +418,8 @@ tests_check_main_SOURCES = \ tests/check_session.c \ tests/check_strutil.c \ tests/check_version.c \ - tests/check_driver_all.c + tests/check_driver_all.c \ + tests/check_device.c tests_check_main_CFLAGS = @check_CFLAGS@ @@ -425,7 +456,7 @@ bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \ bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp - $(AM_V_GEN)python $< doxy/xml/index.xml + $(AM_V_GEN)$(PYTHON) $< doxy/xml/index.xml $(AM_V_at)touch $@ bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \ @@ -455,23 +486,23 @@ PDOC = bindings/python/sigrok/core/doc.i $(PDOC): bindings/swig/doc.py $(CPPXMLDOC) $(AM_V_at)test -d $(PDIR)/sigrok/core || mkdir -p $(PDIR)/sigrok/core - $(AM_V_GEN)python $< python $(CPPXMLDOC) > $@ + $(AM_V_GEN)$(PYTHON) $< python $(CPPXMLDOC) > $@ python-build: $(PDIR)/timestamp python-quietclean: - $(AM_V_at)cd $(PDIR) && python $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \ + $(AM_V_at)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \ | grep -v "can.t clean it"; true $(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \ bindings/swig/classes.i $(PDOC) $(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 \ + $(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 $(AM_V_at)touch $(PDIR)/timestamp python-install: - cd $(PDIR) && python $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix) + cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix) python-clean: $(AM_V_at)$(MAKE) python-quietclean @@ -507,6 +538,7 @@ $(JDOC): bindings/swig/doc.py $(CPPXMLDOC) $(AM_V_GEN)python $< java $(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 $@ $< @@ -515,7 +547,7 @@ $(JJAR): $(JCXX) $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG) $(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS) - $(AM_V_GEN)$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \ + $(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \ -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \ -lsigrokxx -o $(JLIB) @@ -526,13 +558,13 @@ java-install: $(INSTALL) $(JJAR) -t $(datadir)/java java-clean: - rm -f $(JCXX) - rm -f $(JCLS)/*.java - rm -f $(JCLS)/*.class - rm -f $(JINT)/*.class - rm -f $(JJAR) - rm -f $(JLIB) - rm -rf $(JDIR)/doxy/ + $(AM_V_at)rm -f $(JCXX) + $(AM_V_at)rm -f $(JCLS)/*.java + $(AM_V_at)rm -f $(JCLS)/*.class + $(AM_V_at)rm -f $(JINT)/*.class + $(AM_V_at)rm -f $(JJAR) + $(AM_V_at)rm -f $(JLIB) + $(AM_V_at)rm -rf $(JDIR)/doxy/ java-doc: $(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR=$(abs_builddir)/$(JDIR)/ doxygen Doxyfile 2>/dev/null