X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=e871b9f0fe32e60ea602870204be0d63dde0d887;hb=2fba14d05a9dd65fc873b59c438f62b87ab5e2d9;hp=cae48d470e05307055ab887c91fbd53fe441dbf8;hpb=8da8c8265fabe437db254d3b659785ea2352b7dc;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index cae48d47..e871b9f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,9 +116,18 @@ 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_ch9325.c \
+	src/serial_hid_cp2110.c \
+	src/serial_libsp.c \
 	src/scpi/scpi_serial.c
 endif
 if NEED_USB
@@ -155,6 +164,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 \
@@ -556,8 +566,6 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_SYSCLK_SLA5032
 src_libdrivers_la_SOURCES += \
-	src/hardware/sysclk-sla5032/sla5032.h \
-	src/hardware/sysclk-sla5032/sla5032.c \
 	src/hardware/sysclk-sla5032/protocol.h \
 	src/hardware/sysclk-sla5032/protocol.c \
 	src/hardware/sysclk-sla5032/api.c
@@ -731,7 +739,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
@@ -766,7 +774,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=
@@ -814,7 +822,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
@@ -931,7 +939,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