X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=cfa07d57937f657fd2a2afc57f2e0de3deb9b884;hb=2182e775116dba1ef61b62de12480ab5bb21c4b1;hp=23b99e17e2f5b0cea93986c48ae1d6449e783f54;hpb=6b1adfaa86de2195498a0078b0fb50fd76f5aa38;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 23b99e17..cfa07d57 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
@@ -108,10 +111,8 @@ libsigrok_la_SOURCES += \
 	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
@@ -418,7 +419,8 @@ tests_check_main_SOURCES = \
 	tests/check_strutil.c \
 	tests/check_version.c \
 	tests/check_driver_all.c \
-	tests/check_device.c
+	tests/check_device.c \
+	tests/check_trigger.c
 
 tests_check_main_CFLAGS = @check_CFLAGS@
 
@@ -432,26 +434,27 @@ CLEAN_EXTRA =
 
 if BINDINGS_CXX
 
-lib_LTLIBRARIES += bindings/cxx/libsigrokxx.la
+lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la
 
-bindings_cxx_libsigrokxx_la_SOURCES = bindings/cxx/classes.cpp
+bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp
 
-bindings_cxx_libsigrokxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
+bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 
-bindings_cxx_libsigrokxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
+bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
-library_include_HEADERS += \
-	bindings/cxx/include/libsigrok/libsigrok.hpp \
-	bindings/cxx/include/libsigrok/enums.hpp
+bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
+bindings_cxx_libsigrokcxx_la_include_HEADERS = \
+	bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
+	bindings/cxx/include/libsigrokcxx/enums.hpp
 
-pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
+pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
 
 doxy/xml/index.xml: include/libsigrok/libsigrok.h
 	$(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null
 
 bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
 
-bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp
+bindings/cxx/include/libsigrokcxx/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
@@ -465,7 +468,7 @@ cxx-clean:
 	rm -rf doxy/
 	rm -rf bindings/cxx/doxy/
 	rm -f bindings/cxx/enums.cpp
-	rm -f bindings/cxx/include/libsigrok/enums.hpp
+	rm -f bindings/cxx/include/libsigrokcxx/enums.hpp
 	rm -f bindings/cxx/enums.timestamp
 
 CLEAN_EXTRA += cxx-clean
@@ -474,7 +477,7 @@ endif
 
 CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
 
-$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrok.hpp \
+$(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
 		bindings/cxx/enums.timestamp
 	$(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
 
@@ -484,7 +487,7 @@ PDIR = bindings/python
 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_at)test -d $(PDIR)/sigrok/core || $(MKDIR_P) $(PDIR)/sigrok/core
 	$(AM_V_GEN)$(PYTHON) $< python $(CPPXMLDOC) > $@
 
 python-build: $(PDIR)/timestamp
@@ -493,15 +496,18 @@ python-quietclean:
 	$(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 \
+$(PDIR)/timestamp: bindings/cxx/libsigrokcxx.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 \
 		| 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
@@ -533,7 +539,7 @@ JJAR = $(JDIR)/sigrok-core.jar
 java-build: $(JJAR) $(JLIB)
 
 $(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
-	$(AM_V_at)test -d $(JCLS) || mkdir -p $(JCLS)
+	$(AM_V_at)test -d $(JCLS) || $(MKDIR_P) $(JCLS)
 	$(AM_V_GEN)python $< java $(CPPXMLDOC) > $@
 
 $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
@@ -545,10 +551,10 @@ $(JJAR): $(JCXX)
 	$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)
 	$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
-$(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
+$(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS)
 	$(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \
 		-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
-		-lsigrokxx -o $(JLIB)
+		-lsigrokcxx -o $(JLIB)
 
 java-install:
 	$(INSTALL) -d $(libdir)/jni