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 e8d670ce28733a704dbb40259a3b44a9b8e9b939..7e32ded659677cbfe88a18848718699a87cb6b37 100644 (file)
--- a/hardware/common/Makefile.am
+++ b/hardware/common/Makefile.am
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrok project.
 ##
 ## Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
 ##
@@ -17,19 +17,31 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
+SUBDIRS = dmm
+
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwcommon.la
+noinst_LTLIBRARIES = libsigrok_hw_common.la
 
-libsigrokhwcommon_la_SOURCES =
+libsigrok_hw_common_la_SOURCES = scpi.c scpi_tcp.c scpi_usbtmc.c
 
-if NEED_EZUSB
-libsigrokhwcommon_la_SOURCES += ezusb.c
+if NEED_RPC
+libsigrok_hw_common_la_SOURCES += scpi_vxi.c vxi_clnt.c vxi_xdr.c
 endif
 
 if NEED_SERIAL
-libsigrokhwcommon_la_SOURCES += serial.c
+libsigrok_hw_common_la_SOURCES += serial.c scpi_serial.c
+endif
+
+if NEED_USB
+libsigrok_hw_common_la_SOURCES += ezusb.c usb.c scpi_usbtmc_libusb.c
 endif
 
-libsigrokhwcommon_la_CFLAGS = \
+if NEED_VISA
+libsigrok_hw_common_la_SOURCES += scpi_visa.c
+endif
+
+libsigrok_hw_common_la_LIBADD = dmm/libsigrok_hw_common_dmm.la
+
+libsigrok_hw_common_la_CFLAGS = \
        -I$(top_srcdir)