X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=6491d068b0119afe9c58c92be1149662087ed98d;hb=6bcb3ee8763bbfdb94ff6f764a2fa91a7468e37f;hp=2628fbccd1a3ce7264ef0c831088206de8aa6e70;hpb=7343ad1ec72860b5d11ca8f35c4d014a1fa5b643;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index 2628fbcc..6491d068 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,6 +106,10 @@ libsigrok_la_SOURCES += \ src/dmm/rs9lcd.c \ src/dmm/bm25x.c +# Hardware (LCR chip parsers) +libsigrok_la_SOURCES += \ + src/lcr/es51919.c + # Hardware drivers if HW_AGILENT_DMM libsigrok_la_SOURCES += \ @@ -286,6 +290,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 \ @@ -436,7 +447,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 \ @@ -466,23 +477,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