X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=3e2388982bd03ab9e70d3529040dbf92ad975161;hb=3cd4b381744eb88fd4ba32565bd408c33b431629;hp=aff066919abae93299b98cd80529cfd9bc4b61c2;hpb=52ff4f6a04cbdb966ee538bd447ae206215b528a;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index aff06691..3e238898 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 \ @@ -99,6 +106,14 @@ libsigrok_la_SOURCES += \ src/scpi/scpi_libgpib.c endif +# Modbus support +libsigrok_la_SOURCES += \ + src/modbus/modbus.c +if NEED_SERIAL +libsigrok_la_SOURCES += \ + src/modbus/modbus_serial_rtu.c +endif + # Hardware (DMM chip parsers) libsigrok_la_SOURCES += \ src/dmm/es519xx.c \ @@ -108,10 +123,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 +157,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 +233,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 += \ @@ -258,6 +285,12 @@ libsigrok_la_SOURCES += \ src/hardware/manson-hcs-3xxx/protocol.c \ src/hardware/manson-hcs-3xxx/api.c endif +if HW_MAYNUO_M97 +libsigrok_la_SOURCES += \ + src/hardware/maynuo-m97/protocol.h \ + src/hardware/maynuo-m97/protocol.c \ + src/hardware/maynuo-m97/api.c +endif if HW_MIC_985XX libsigrok_la_SOURCES += \ src/hardware/mic-985xx/protocol.h \ @@ -380,6 +413,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 +439,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 +480,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 +494,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 +508,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 +517,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 @@ -558,10 +597,10 @@ $(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS) -lsigrokcxx -o $(JLIB) java-install: - $(INSTALL) -d $(libdir)/jni - $(INSTALL) $(JLIB) -t $(libdir)/jni - $(INSTALL) -d $(datadir)/java - $(INSTALL) $(JJAR) -t $(datadir)/java + $(INSTALL) -d $(DESTDIR)$(libdir)/jni + $(INSTALL) $(JLIB) -t $(DESTDIR)$(libdir)/jni + $(INSTALL) -d $(DESTDIR)$(datadir)/java + $(INSTALL) $(JJAR) -t $(DESTDIR)$(datadir)/java java-clean: $(AM_V_at)rm -f $(JCXX)