X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=bf980c22bca7f637c92c5178b897ec8effe9d397;hb=702f42e8eb33d8d1ffb5b748097428c0f4434c6d;hp=a7cb82440cabef6d048a7a628b8756546fd42be9;hpb=161dc24d845acfc00108dd33eac7c42430d21e17;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index a7cb8244..bf980c22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,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 \
@@ -108,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
@@ -140,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 \
@@ -208,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 += \
@@ -404,29 +423,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/check_trigger.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
 
@@ -444,7 +464,8 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 
 bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
-library_include_HEADERS += \
+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
 
@@ -457,9 +478,9 @@ bindings/cxx/enums.cpp: 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 \