X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=Makefile.am;fp=Makefile.am;h=2e111e9341ef9953ce59c7577265a10b39d4d9db;hp=148de0ff70108628d0230697c754e30ea26bfc5a;hb=e4204b1757459a03c0a70849a659f27387edc295;hpb=8686b747cd40695c36f998603f6e853ee5eea883 diff --git a/Makefile.am b/Makefile.am index 148de0ff..2e111e93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,6 +95,7 @@ libsigrok_la_SOURCES += \ src/output/ols.c \ src/output/srzip.c \ src/output/vcd.c \ + src/output/wavedrom.c \ src/output/null.c # Transform modules @@ -116,9 +117,21 @@ libsigrok_la_SOURCES += \ src/scpi/vxi_xdr.c \ src/scpi/vxi.h endif +# if HAVE_BLUETOOTH +libsigrok_la_SOURCES += \ + src/bt/bt_bluez.c +# endif if NEED_SERIAL libsigrok_la_SOURCES += \ src/serial.c \ + src/serial_bt.c \ + src/serial_hid.c \ + src/serial_hid.h \ + src/serial_hid_bu86x.c \ + src/serial_hid_ch9325.c \ + src/serial_hid_cp2110.c \ + src/serial_hid_victor.c \ + src/serial_libsp.c \ src/scpi/scpi_serial.c endif if NEED_USB @@ -148,6 +161,7 @@ endif libsigrok_la_SOURCES += \ src/dmm/asycii.c \ src/dmm/bm25x.c \ + src/dmm/bm86x.c \ src/dmm/dtm0660.c \ src/dmm/eev121gw.c \ src/dmm/es519xx.c \ @@ -155,6 +169,7 @@ libsigrok_la_SOURCES += \ src/dmm/fs9922.c \ src/dmm/m2110.c \ src/dmm/metex14.c \ + src/dmm/ms2115b.c \ src/dmm/ms8250d.c \ src/dmm/rs9lcd.c \ src/dmm/ut372.c \ @@ -165,7 +180,8 @@ libsigrok_la_SOURCES += \ # Hardware (LCR chip parsers) if NEED_SERIAL libsigrok_la_SOURCES += \ - src/lcr/es51919.c + src/lcr/es51919.c \ + src/lcr/vc4080.c endif # Hardware (Scale protocol parsers) @@ -238,12 +254,6 @@ src_libdrivers_la_SOURCES += \ src/hardware/beaglelogic/beaglelogic_native.c \ src/hardware/beaglelogic/beaglelogic_tcp.c endif -if HW_BRYMEN_BM86X -src_libdrivers_la_SOURCES += \ - src/hardware/brymen-bm86x/protocol.h \ - src/hardware/brymen-bm86x/protocol.c \ - src/hardware/brymen-bm86x/api.c -endif if HW_BRYMEN_DMM src_libdrivers_la_SOURCES += \ src/hardware/brymen-dmm/parser.c \ @@ -437,18 +447,36 @@ src_libdrivers_la_SOURCES += \ src/hardware/manson-hcs-3xxx/protocol.c \ src/hardware/manson-hcs-3xxx/api.c endif +if HW_MASTECH_MS6514 +src_libdrivers_la_SOURCES += \ + src/hardware/mastech-ms6514/protocol.h \ + src/hardware/mastech-ms6514/protocol.c \ + src/hardware/mastech-ms6514/api.c +endif if HW_MAYNUO_M97 src_libdrivers_la_SOURCES += \ src/hardware/maynuo-m97/protocol.h \ src/hardware/maynuo-m97/protocol.c \ src/hardware/maynuo-m97/api.c endif +if HW_MICROCHIP_PICKIT2 +src_libdrivers_la_SOURCES += \ + src/hardware/microchip-pickit2/protocol.h \ + src/hardware/microchip-pickit2/protocol.c \ + src/hardware/microchip-pickit2/api.c +endif if HW_MIC_985XX src_libdrivers_la_SOURCES += \ src/hardware/mic-985xx/protocol.h \ src/hardware/mic-985xx/protocol.c \ src/hardware/mic-985xx/api.c endif +if HW_MOOSHIMETER_DMM +src_libdrivers_la_SOURCES += \ + src/hardware/mooshimeter-dmm/protocol.h \ + src/hardware/mooshimeter-dmm/protocol.c \ + src/hardware/mooshimeter-dmm/api.c +endif if HW_MOTECH_LPS_30X src_libdrivers_la_SOURCES += \ src/hardware/motech-lps-30x/protocol.h \ @@ -509,6 +537,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/saleae-logic-pro/protocol.c \ src/hardware/saleae-logic-pro/api.c endif +if HW_SCPI_DMM +src_libdrivers_la_SOURCES += \ + src/hardware/scpi-dmm/protocol.h \ + src/hardware/scpi-dmm/protocol.c \ + src/hardware/scpi-dmm/api.c +endif if HW_SCPI_PPS src_libdrivers_la_SOURCES += \ src/hardware/scpi-pps/protocol.h \ @@ -524,6 +558,8 @@ src_libdrivers_la_SOURCES += \ endif if HW_SERIAL_LCR src_libdrivers_la_SOURCES += \ + src/hardware/serial-lcr/protocol.h \ + src/hardware/serial-lcr/protocol.c \ src/hardware/serial-lcr/api.c endif if HW_SIGLENT_SDS @@ -542,6 +578,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/sysclk-lwla/protocol.c \ src/hardware/sysclk-lwla/api.c endif +if HW_SYSCLK_SLA5032 +src_libdrivers_la_SOURCES += \ + src/hardware/sysclk-sla5032/protocol.h \ + src/hardware/sysclk-sla5032/protocol.c \ + src/hardware/sysclk-sla5032/api.c +endif if HW_TELEINFO src_libdrivers_la_SOURCES += \ src/hardware/teleinfo/protocol.h \ @@ -572,12 +614,6 @@ src_libdrivers_la_SOURCES += \ src/hardware/uni-t-ut32x/protocol.c \ src/hardware/uni-t-ut32x/api.c endif -if HW_VICTOR_DMM -src_libdrivers_la_SOURCES += \ - src/hardware/victor-dmm/protocol.h \ - src/hardware/victor-dmm/protocol.c \ - src/hardware/victor-dmm/api.c -endif if HW_YOKOGAWA_DLM src_libdrivers_la_SOURCES += \ src/hardware/yokogawa-dlm/protocol.h \ @@ -711,7 +747,7 @@ nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS = \ pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc doxy/xml/index.xml: include/libsigrok/libsigrok.h - $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null + $(AM_V_GEN)cd $(srcdir) && SRCDIR=$(abs_srcdir)/ BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null bindings/swig/enums.i: bindings/cxx/enums.timestamp bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp @@ -746,7 +782,7 @@ CPPXMLDOC = bindings/cxx/doxy/xml/index.xml $(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 + $(AM_V_GEN)cd $(srcdir)/bindings/cxx && SRCDIR=$(abs_srcdir)/bindings/cxx/ BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null # Macro definitions to be used by the SWIG parser. swig_defs = -Dnoexcept= -Dprivate=protected -DG_GNUC_BEGIN_IGNORE_DEPRECATIONS= -DG_GNUC_END_IGNORE_DEPRECATIONS= @@ -794,7 +830,7 @@ python-clean: -$(AM_V_at)$(setup_py) clean --all 2>/dev/null python-doc: - $(AM_V_at)cd $(srcdir)/$(PDIR) && BUILDDIR="$(abs_builddir)/$(PDIR)/" doxygen Doxyfile 2>/dev/null + $(AM_V_at)cd $(srcdir)/$(PDIR) && SRCDIR="$(abs_srcdir)/$(PDIR)/" BUILDDIR="$(abs_builddir)/$(PDIR)/" doxygen Doxyfile 2>/dev/null BUILD_EXTRA += python-build INSTALL_EXTRA += python-install @@ -911,7 +947,7 @@ java-clean: -$(AM_V_at)rm -fr $(JDIR)/doxy java-doc: - $(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR="$(abs_builddir)/$(JDIR)/" doxygen Doxyfile + $(AM_V_at)cd $(srcdir)/$(JDIR) && SRCDIR="$(abs_srcdir)/$(JDIR)/" BUILDDIR="$(abs_builddir)/$(JDIR)/" doxygen Doxyfile BUILD_EXTRA += java-build INSTALL_EXTRA += java-install