X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=5273a27f7f70307b2ee4ad4ec3818e1b3704cf32;hb=1ac6436468d7d4110d053c994df2db0583b0857e;hp=7aecd33c4cdf59558e614366f0949b95c8519fdd;hpb=e1b115bd4d5ed195b46daf604c35a33c7a760533;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index 7aecd33c..5273a27f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,7 +108,6 @@ libsigrok_la_SOURCES += \ libsigrok_la_SOURCES += \ src/scpi.h \ src/scpi/scpi.c \ - src/scpi/helpers.c \ src/scpi/scpi_tcp.c if NEED_RPC libsigrok_la_SOURCES += \ @@ -117,9 +116,20 @@ 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_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 @@ -147,19 +157,23 @@ endif # Hardware (DMM chip parsers) 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 \ src/dmm/fs9721.c \ src/dmm/fs9922.c \ src/dmm/m2110.c \ src/dmm/metex14.c \ - src/dmm/asycii.c \ + src/dmm/ms2115b.c \ + src/dmm/ms8250d.c \ src/dmm/rs9lcd.c \ - src/dmm/bm25x.c \ - src/dmm/ut71x.c \ src/dmm/ut372.c \ + src/dmm/ut71x.c \ src/dmm/vc870.c \ - src/dmm/dtm0660.c \ - src/dmm/ms8250d.c + src/dmm/vc96.c # Hardware (LCR chip parsers) if NEED_SERIAL @@ -237,12 +251,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 \ @@ -292,6 +300,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/dreamsourcelab-dslogic/protocol.c \ src/hardware/dreamsourcelab-dslogic/api.c endif +if HW_FLUKE_45 +src_libdrivers_la_SOURCES += \ + src/hardware/fluke-45/protocol.h \ + src/hardware/fluke-45/protocol.c \ + src/hardware/fluke-45/api.c +endif if HW_FLUKE_DMM src_libdrivers_la_SOURCES += \ src/hardware/fluke-dmm/protocol.h \ @@ -322,6 +336,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/gwinstek-gds-800/protocol.c \ src/hardware/gwinstek-gds-800/api.c endif +if HW_GWINSTEK_GPD +src_libdrivers_la_SOURCES += \ + src/hardware/gwinstek-gpd/protocol.h \ + src/hardware/gwinstek-gpd/protocol.c \ + src/hardware/gwinstek-gpd/api.c +endif if HW_HAMEG_HMO src_libdrivers_la_SOURCES += \ src/hardware/hameg-hmo/protocol.h \ @@ -376,6 +396,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/ikalogic-scanaplus/protocol.c \ src/hardware/ikalogic-scanaplus/api.c endif +if HW_IPDBG_LA +src_libdrivers_la_SOURCES += \ + src/hardware/ipdbg-la/protocol.h \ + src/hardware/ipdbg-la/protocol.c \ + src/hardware/ipdbg-la/api.c +endif if HW_KECHENG_KC_330B src_libdrivers_la_SOURCES += \ src/hardware/kecheng-kc-330b/protocol.h \ @@ -424,6 +450,12 @@ src_libdrivers_la_SOURCES += \ 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 \ @@ -490,6 +522,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 \ @@ -505,6 +543,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 @@ -523,6 +563,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 \ @@ -553,12 +599,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 \ @@ -692,7 +732,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 @@ -727,7 +767,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= @@ -775,7 +815,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 @@ -892,7 +932,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