X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=76799c124e48e84b70bf7572622f01d24624266c;hb=9a10ce65d62526a24cbca2ee9e1cf55e132d6f7a;hp=73a67b9358ff58f8402d2eb8f8d4a12637112667;hpb=2fe07d3fb521ac1aac6c1e8a6a8fc8d651b28a29;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 73a67b93..76799c12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,6 +91,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 += \
@@ -282,6 +286,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 \
@@ -432,7 +443,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 \
@@ -462,23 +473,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