X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=Makefile.am;h=9bf6eb7dfb469f7c594f1fcab1d7aa8f11413c6f;hp=c98422956561d641d36c014d4f84dc267de04ea1;hb=22fdb67fa0714c11cc0a58ee1423f55d18a4f080;hpb=567d1feae8597366582a57db82bc3c905eecb665 diff --git a/Makefile.am b/Makefile.am index c9842295..9bf6eb7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-python FIRMWARE_DIR = $(datadir)/sigrok-firmware -local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. +local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. @RPC_CFLAGS@ if BINDINGS_CXX local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx endif @@ -50,6 +50,9 @@ lib_LTLIBRARIES = libsigrok.la # Backend files libsigrok_la_SOURCES = \ src/backend.c \ + src/binary_helpers.c \ + src/conversion.c \ + src/crc.c \ src/device.c \ src/session.c \ src/session_file.c \ @@ -70,13 +73,17 @@ libsigrok_la_SOURCES = \ # Input modules libsigrok_la_SOURCES += \ src/input/input.c \ + src/input/feed_queue.c \ src/input/binary.c \ src/input/chronovu_la8.c \ src/input/csv.c \ + src/input/logicport.c \ src/input/raw_analog.c \ + src/input/saleae.c \ src/input/trace32_ad.c \ src/input/vcd.c \ - src/input/wav.c + src/input/wav.c \ + src/input/null.c # Output modules libsigrok_la_SOURCES += \ @@ -91,7 +98,9 @@ libsigrok_la_SOURCES += \ src/output/hex.c \ src/output/ols.c \ src/output/srzip.c \ - src/output/vcd.c + src/output/vcd.c \ + src/output/wavedrom.c \ + src/output/null.c # Transform modules libsigrok_la_SOURCES += \ @@ -104,7 +113,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 += \ @@ -113,9 +121,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 @@ -143,23 +163,32 @@ endif # Hardware (DMM chip parsers) libsigrok_la_SOURCES += \ + src/dmm/asycii.c \ + src/dmm/bm25x.c \ + src/dmm/bm52x.c \ + src/dmm/bm85x.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/mm38xr.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/vc96.c # 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) @@ -167,15 +196,22 @@ libsigrok_la_SOURCES += \ src/scale/kern.c # Hardware drivers -noinst_LTLIBRARIES = src/libdrivers.la +noinst_LTLIBRARIES = src/libdrivers.la \ + src/libdrivers_head.la src/libdrivers_tail.la -src/libdrivers.o: src/libdrivers.la - $(AM_V_CCLD)$(LINK) src/libdrivers.la +src/libdrivers.o: src/libdrivers.la \ + src/libdrivers_head.la src/libdrivers_tail.la + $(AM_V_CCLD)$(LINK) src/libdrivers_head.la src/libdrivers.la \ + src/libdrivers_tail.la src/libdrivers.lo: src/libdrivers.o $(AM_V_GEN)echo "# Generated by libtool" > $@ $(AM_V_at)echo "pic_object='libdrivers.o'" >> $@ $(AM_V_at)echo "non_pic_object='libdrivers.o'" >> $@ +src_libdrivers_head_la_SOURCES = src/driver_list_start.c + +src_libdrivers_tail_la_SOURCES = src/driver_list_stop.c + src_libdrivers_la_SOURCES = src/drivers.c if HW_AGILENT_DMM @@ -221,20 +257,9 @@ src_libdrivers_la_SOURCES += \ src/hardware/beaglelogic/beaglelogic.h \ src/hardware/beaglelogic/protocol.h \ src/hardware/beaglelogic/protocol.c \ - src/hardware/beaglelogic/api.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 \ - src/hardware/brymen-dmm/protocol.h \ - src/hardware/brymen-dmm/protocol.c \ - src/hardware/brymen-dmm/api.c + src/hardware/beaglelogic/api.c \ + src/hardware/beaglelogic/beaglelogic_native.c \ + src/hardware/beaglelogic/beaglelogic_tcp.c endif if HW_CEM_DT_885X src_libdrivers_la_SOURCES += \ @@ -266,12 +291,30 @@ src_libdrivers_la_SOURCES += \ src/hardware/conrad-digi-35-cpu/protocol.c \ src/hardware/conrad-digi-35-cpu/api.c endif +if HW_DCTTECH_USBRELAY +src_libdrivers_la_SOURCES += \ + src/hardware/dcttech-usbrelay/protocol.h \ + src/hardware/dcttech-usbrelay/protocol.c \ + src/hardware/dcttech-usbrelay/api.c +endif if HW_DEMO src_libdrivers_la_SOURCES += \ src/hardware/demo/protocol.h \ src/hardware/demo/protocol.c \ src/hardware/demo/api.c endif +if HW_DREAMSOURCELAB_DSLOGIC +src_libdrivers_la_SOURCES += \ + src/hardware/dreamsourcelab-dslogic/protocol.h \ + 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 \ @@ -288,9 +331,7 @@ if HW_FX2LAFW src_libdrivers_la_SOURCES += \ src/hardware/fx2lafw/protocol.h \ src/hardware/fx2lafw/protocol.c \ - src/hardware/fx2lafw/api.c \ - src/hardware/fx2lafw/dslogic.c \ - src/hardware/fx2lafw/dslogic.h + src/hardware/fx2lafw/api.c endif if HW_GMC_MH_1X_2X src_libdrivers_la_SOURCES += \ @@ -304,12 +345,24 @@ 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 \ src/hardware/hameg-hmo/protocol.c \ src/hardware/hameg-hmo/api.c endif +if HW_HANTEK_4032L +src_libdrivers_la_SOURCES += \ + src/hardware/hantek-4032l/protocol.h \ + src/hardware/hantek-4032l/protocol.c \ + src/hardware/hantek-4032l/api.c +endif if HW_HANTEK_6XXX src_libdrivers_la_SOURCES += \ src/hardware/hantek-6xxx/protocol.h \ @@ -328,6 +381,18 @@ src_libdrivers_la_SOURCES += \ src/hardware/hp-3457a/protocol.c \ src/hardware/hp-3457a/api.c endif +if HW_HP_3478A +src_libdrivers_la_SOURCES += \ + src/hardware/hp-3478a/protocol.h \ + src/hardware/hp-3478a/protocol.c \ + src/hardware/hp-3478a/api.c +endif +if HW_HP_59306A +src_libdrivers_la_SOURCES += \ + src/hardware/hp-59306a/protocol.h \ + src/hardware/hp-59306a/protocol.c \ + src/hardware/hp-59306a/api.c +endif if HW_HUNG_CHANG_DSO_2100 src_libdrivers_la_SOURCES += \ src/hardware/hung-chang-dso-2100/protocol.h \ @@ -346,6 +411,18 @@ 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_ITECH_IT8500 +src_libdrivers_la_SOURCES += \ + src/hardware/itech-it8500/protocol.h \ + src/hardware/itech-it8500/protocol.c \ + src/hardware/itech-it8500/api.c +endif if HW_KECHENG_KC_330B src_libdrivers_la_SOURCES += \ src/hardware/kecheng-kc-330b/protocol.h \ @@ -358,6 +435,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/kern-scale/protocol.c \ src/hardware/kern-scale/api.c endif +if HW_KINGST_LA2016 +src_libdrivers_la_SOURCES += \ + src/hardware/kingst-la2016/protocol.h \ + src/hardware/kingst-la2016/protocol.c \ + src/hardware/kingst-la2016/api.c +endif if HW_KORAD_KAXXXXP src_libdrivers_la_SOURCES += \ src/hardware/korad-kaxxxxp/protocol.h \ @@ -388,18 +471,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 \ @@ -430,6 +531,30 @@ src_libdrivers_la_SOURCES += \ src/hardware/pipistrello-ols/protocol.c \ src/hardware/pipistrello-ols/api.c endif +if HW_RDTECH_DPS +src_libdrivers_la_SOURCES += \ + src/hardware/rdtech-dps/protocol.h \ + src/hardware/rdtech-dps/protocol.c \ + src/hardware/rdtech-dps/api.c +endif +if HW_RDTECH_UM +src_libdrivers_la_SOURCES += \ + src/hardware/rdtech-um/protocol.h \ + src/hardware/rdtech-um/protocol.c \ + src/hardware/rdtech-um/api.c +endif +if HW_RDTECH_TC +src_libdrivers_la_SOURCES += \ + src/hardware/rdtech-tc/protocol.h \ + src/hardware/rdtech-tc/protocol.c \ + src/hardware/rdtech-tc/api.c +endif +if HW_RIGOL_DG +src_libdrivers_la_SOURCES += \ + src/hardware/rigol-dg/protocol.h \ + src/hardware/rigol-dg/protocol.c \ + src/hardware/rigol-dg/api.c +endif if HW_RIGOL_DS src_libdrivers_la_SOURCES += \ src/hardware/rigol-ds/protocol.h \ @@ -448,6 +573,18 @@ src_libdrivers_la_SOURCES += \ src/hardware/saleae-logic16/protocol.c \ src/hardware/saleae-logic16/api.c endif +if HW_SALEAE_LOGIC_PRO +src_libdrivers_la_SOURCES += \ + src/hardware/saleae-logic-pro/protocol.h \ + 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 \ @@ -463,8 +600,16 @@ 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 +src_libdrivers_la_SOURCES += \ + src/hardware/siglent-sds/protocol.h \ + src/hardware/siglent-sds/protocol.c \ + src/hardware/siglent-sds/api.c +endif if HW_SYSCLK_LWLA src_libdrivers_la_SOURCES += \ src/hardware/sysclk-lwla/lwla.h \ @@ -475,6 +620,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 \ @@ -499,18 +650,18 @@ src_libdrivers_la_SOURCES += \ src/hardware/uni-t-dmm/protocol.c \ src/hardware/uni-t-dmm/api.c endif +if HW_UNI_T_UT181A +src_libdrivers_la_SOURCES += \ + src/hardware/uni-t-ut181a/protocol.h \ + src/hardware/uni-t-ut181a/protocol.c \ + src/hardware/uni-t-ut181a/api.c +endif if HW_UNI_T_UT32X src_libdrivers_la_SOURCES += \ src/hardware/uni-t-ut32x/protocol.h \ 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 \ @@ -529,6 +680,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/zeroplus-logic-cube/protocol.c \ src/hardware/zeroplus-logic-cube/api.c endif +if HW_ZKETECH_EBD_USB +src_libdrivers_la_SOURCES += \ + src/hardware/zketech-ebd-usb/protocol.h \ + src/hardware/zketech-ebd-usb/protocol.c \ + src/hardware/zketech-ebd-usb/api.c +endif libsigrok_la_LIBADD = src/libdrivers.lo $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS) libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined @@ -544,7 +701,7 @@ noinst_HEADERS = src/libsigrok-internal.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsigrok.pc -mimeappdir = $(datadir)/mime/application +mimeappdir = $(datadir)/mime/packages mimeapp_DATA = contrib/vnd.sigrok.session.xml mimeicondir = $(datadir)/icons/hicolor/48x48/mimetypes @@ -581,7 +738,9 @@ EXTRA_DIST = \ contrib/libsigrok.png \ contrib/libsigrok.svg \ contrib/vnd.sigrok.session.xml \ - contrib/z60_libsigrok.rules + contrib/60-libsigrok.rules \ + contrib/61-libsigrok-plugdev.rules \ + contrib/61-libsigrok-uaccess.rules if HAVE_CHECK TESTS = tests/main @@ -604,7 +763,8 @@ tests_main_SOURCES = \ tests/driver_all.c \ tests/device.c \ tests/trigger.c \ - tests/analog.c + tests/analog.c \ + tests/conv.c tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS) @@ -636,7 +796,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 @@ -671,7 +831,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= @@ -719,7 +879,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 @@ -836,7 +996,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