X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=b6bec636df90f382aba6403eef51f17ef00ca047;hb=3b95bd9152e6f54e259caf0909af86768c518e7a;hp=6491d068b0119afe9c58c92be1149662087ed98d;hpb=6bcb3ee8763bbfdb94ff6f764a2fa91a7468e37f;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 6491d068..b6bec636 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,8 @@ libsigrok_la_SOURCES = \
 	src/hwdriver.c \
 	src/trigger.c \
 	src/soft-trigger.c \
+	src/analog.c \
+	src/fallback.c \
 	src/strutil.c \
 	src/log.c \
 	src/version.c \
@@ -63,6 +65,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,11 +107,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
@@ -188,6 +194,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 \
@@ -410,7 +420,9 @@ 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_trigger.c
 
 tests_check_main_CFLAGS = @check_CFLAGS@
 
@@ -492,8 +504,11 @@ $(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \
 		| 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)
+$(DESTDIR)$(prefix):
+	$(MKDIR_P) $@
+
+python-install: $(DESTDIR)$(prefix)
+	cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix) `test "$(DESTDIR)" && echo --root=$(DESTDIR)`
 
 python-clean:
 	$(AM_V_at)$(MAKE) python-quietclean