victor-dmm: remove obsolete device driver, has moved to serial-dmm

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae5641d0126667a271c3ab612611fe4a3b3ca6cd..5273a27f7f70307b2ee4ad4ec3818e1b3704cf32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,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
@@ -148,6 +159,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 +167,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 \
@@ -238,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 \
@@ -536,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
@@ -590,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 \
@@ -729,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
@@ -764,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=
@@ -812,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
@@ -929,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