X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=dd281c5b8e18a31291c838c8f82592e87a704408;hb=b65649f6b9dca28829e4f242ae79c75db767fdfa;hp=20ac774cfdd4e0a82c6b7e89da1de06ac3c23c4d;hpb=828eeea2270a1858d28fa7492602860c39e4d928;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 20ac774c..dd281c5b 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,11 +117,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.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
@@ -151,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 \
@@ -169,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)
@@ -242,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 \
@@ -441,6 +447,12 @@ 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 \
@@ -459,6 +471,12 @@ src_libdrivers_la_SOURCES += \
 	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 \
@@ -540,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
@@ -594,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 \
@@ -701,7 +715,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)