X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=add31e9b6c9d56ca41a5d8677191d233c9a509e7;hb=c33ff3771bcbab940ee7da88c89e70b61c26d0d3;hp=aff066919abae93299b98cd80529cfd9bc4b61c2;hpb=52ff4f6a04cbdb966ee538bd447ae206215b528a;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index aff06691..add31e9b 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
@@ -417,6 +424,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,9 +452,10 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 
 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/libsigrokcxx.pc
 
@@ -455,11 +464,11 @@ doxy/xml/index.xml: include/libsigrok/libsigrok.h
 
 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 \
@@ -469,7 +478,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
@@ -478,7 +487,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