configure.ac: Drop unneeded AC_CANONICAL_SYSTEM.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aff066919abae93299b98cd80529cfd9bc4b61c2..50d732dca60f2c6a89554b7f69076df1d9d805ec 100644 (file)
--- 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 += \
@@ -380,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 \
@@ -404,29 +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/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,9 +466,12 @@ 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_LDFLAGS += -no-undefined
+
+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 +480,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 +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
@@ -478,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