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

diff --git a/Makefile.am b/Makefile.am
index a7cb8244..98e1f74e 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 \
@@ -111,7 +118,7 @@ libsigrok_la_SOURCES += \
 	src/dmm/ut71x.c
 
 # Hardware (LCR chip parsers)
-if HW_DEREE_DE5000
+if NEED_SERIAL
 libsigrok_la_SOURCES += \
 	src/lcr/es51919.c
 endif
@@ -140,6 +147,12 @@ 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
+endif
 if HW_BEAGLELOGIC
 libsigrok_la_SOURCES += \
 	src/hardware/beaglelogic/beaglelogic.h \
@@ -417,6 +430,7 @@ tests_check_main_SOURCES = \
 	tests/check_input_all.c \
 	tests/check_input_binary.c \
 	tests/check_output_all.c \
+	tests/check_transform_all.c \
 	tests/check_session.c \
 	tests/check_strutil.c \
 	tests/check_version.c \
@@ -444,7 +458,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 +472,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 \