X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=2487b2ef8f48a17c234d7910ca4d3331959a6152;hb=a5892391b02689d7babd98d44e6537b34cef8e80;hp=26319566301960d243f5437c0fef1fc6569fe5f4;hpb=d4eabea847e675bc333be1e51ead4e0be6fc976b;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 26319566..2487b2ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ libsigrok_la_SOURCES = \
 	src/hwdriver.c \
 	src/trigger.c \
 	src/soft-trigger.c \
+	src/analog.c \
 	src/strutil.c \
 	src/log.c \
 	src/version.c \
@@ -63,6 +64,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
@@ -104,7 +106,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
@@ -184,6 +193,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 \
@@ -406,7 +419,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@
 
@@ -443,7 +457,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 \
@@ -473,23 +487,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