scpi_usbtmc_libusb.c: Fix two error checks.

[libsigrok.git] / hardware / common / Makefile.am

diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am
index d6da68b0727fc3a5998b230848f378061fbef567..7e32ded659677cbfe88a18848718699a87cb6b37 100644 (file)
--- a/hardware/common/Makefile.am
+++ b/hardware/common/Makefile.am
@@ -20,16 +20,28 @@
 SUBDIRS = dmm
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwcommon.la
+noinst_LTLIBRARIES = libsigrok_hw_common.la
 
-libsigrokhwcommon_la_SOURCES = serial.c
+libsigrok_hw_common_la_SOURCES = scpi.c scpi_tcp.c scpi_usbtmc.c
+
+if NEED_RPC
+libsigrok_hw_common_la_SOURCES += scpi_vxi.c vxi_clnt.c vxi_xdr.c
+endif
+
+if NEED_SERIAL
+libsigrok_hw_common_la_SOURCES += serial.c scpi_serial.c
+endif
 
 if NEED_USB
-libsigrokhwcommon_la_SOURCES += ezusb.c usb.c
+libsigrok_hw_common_la_SOURCES += ezusb.c usb.c scpi_usbtmc_libusb.c
+endif
+
+if NEED_VISA
+libsigrok_hw_common_la_SOURCES += scpi_visa.c
 endif
 
-libsigrokhwcommon_la_LIBADD = dmm/libsigrok_hw_common_dmm.la
+libsigrok_hw_common_la_LIBADD = dmm/libsigrok_hw_common_dmm.la
 
-libsigrokhwcommon_la_CFLAGS = \
+libsigrok_hw_common_la_CFLAGS = \
        -I$(top_srcdir)