X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=Makefile.am;h=50d732dca60f2c6a89554b7f69076df1d9d805ec;hp=7b67a9a5e4a408394427cd65aef57789e25dd384;hb=fc8f82e9650127b73a6bdcdad565b8e7f8f34e5b;hpb=3250d8c7e05f2d6a3ffbdf2499af8a13fa99fe39

diff --git a/Makefile.am b/Makefile.am
index 7b67a9a5..50d732dc 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 \
@@ -66,6 +68,13 @@ libsigrok_la_SOURCES += \
 	src/output/srzip.c \
 	src/output/vcd.c
 
+# Transform modules
+libsigrok_la_SOURCES += \
+	src/transform/transform.c \
+	src/transform/nop.c \
+	src/transform/scale.c \
+	src/transform/invert.c
+
 # SCPI support
 libsigrok_la_SOURCES += \
 	src/scpi/scpi.c \
@@ -106,10 +115,12 @@ libsigrok_la_SOURCES += \
 	src/dmm/metex14.c \
 	src/dmm/rs9lcd.c \
 	src/dmm/bm25x.c \
-	src/dmm/ut71x.c
+	src/dmm/ut71x.c \
+	src/dmm/ut372.c \
+	src/dmm/vc870.c
 
 # Hardware (LCR chip parsers)
-if HW_DEREE_DE5000
+if NEED_SERIAL
 libsigrok_la_SOURCES += \
 	src/lcr/es51919.c
 endif
@@ -138,6 +149,14 @@ libsigrok_la_SOURCES += \
 	src/hardware/atten-pps3xxx/protocol.c \
 	src/hardware/atten-pps3xxx/api.c
 endif
+if HW_BAYLIBRE_ACME
+libsigrok_la_SOURCES += \
+	src/hardware/baylibre-acme/protocol.h \
+	src/hardware/baylibre-acme/protocol.c \
+	src/hardware/baylibre-acme/api.c \
+	src/hardware/baylibre-acme/gpio.h \
+	src/hardware/baylibre-acme/gpio.c
+endif
 if HW_BEAGLELOGIC
 libsigrok_la_SOURCES += \
 	src/hardware/beaglelogic/beaglelogic.h \
@@ -206,7 +225,9 @@ if HW_FX2LAFW
 libsigrok_la_SOURCES += \
 	src/hardware/fx2lafw/protocol.h \
 	src/hardware/fx2lafw/protocol.c \
-	src/hardware/fx2lafw/api.c
+	src/hardware/fx2lafw/api.c \
+	src/hardware/fx2lafw/dslogic.c \
+	src/hardware/fx2lafw/dslogic.h
 endif
 if HW_GMC_MH_1X_2X
 libsigrok_la_SOURCES += \
@@ -378,6 +399,8 @@ libsigrok_la_LIBADD = $(LIBOBJS)
 
 libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
+libsigrok_la_LDFLAGS += -no-undefined
+
 library_includedir = $(includedir)/libsigrok
 library_include_HEADERS = \
 	include/libsigrok/libsigrok.h \
@@ -402,28 +425,30 @@ EXTRA_DIST = \
 
 if HAVE_CHECK
 
-TESTS = tests/check_main
+TESTS = tests/main
 
 check_PROGRAMS = ${TESTS}
 
-tests_check_main_SOURCES = \
+tests_main_SOURCES = \
 	include/libsigrok/libsigrok.h \
 	tests/lib.c \
 	tests/lib.h \
-	tests/check_main.c \
-	tests/check_core.c \
-	tests/check_input_all.c \
-	tests/check_input_binary.c \
-	tests/check_output_all.c \
-	tests/check_session.c \
-	tests/check_strutil.c \
-	tests/check_version.c \
-	tests/check_driver_all.c \
-	tests/check_device.c
+	tests/main.c \
+	tests/core.c \
+	tests/input_all.c \
+	tests/input_binary.c \
+	tests/output_all.c \
+	tests/transform_all.c \
+	tests/session.c \
+	tests/strutil.c \
+	tests/version.c \
+	tests/driver_all.c \
+	tests/device.c \
+	tests/trigger.c
 
-tests_check_main_CFLAGS = @check_CFLAGS@
+tests_main_CFLAGS = @check_CFLAGS@
 
-tests_check_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@
+tests_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@
 
 endif
 
@@ -433,30 +458,33 @@ 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_LDFLAGS += -no-undefined
 
-pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
+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/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/enums.timestamp: $(srcdir)/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) $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml
 	$(AM_V_at)touch $@
 
 bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \
@@ -466,7 +494,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
@@ -475,7 +503,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
 
@@ -485,7 +513,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
@@ -494,15 +522,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
@@ -534,7 +565,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)
@@ -546,10 +577,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