X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2FMakefile.am;h=bba80672691434bc073810753435c5edc4768bb1;hb=945e4343e2be4ad9e70e1a995182988b2331e0bd;hp=ca3bc8c059640ba60d56e14f9138eb8720fdda7b;hpb=db8ae7b941a31b2bc64e14d60a1e962fd2b2dc38;p=libsigrok.git

diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am
index ca3bc8c0..bba80672 100644
--- 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,27 @@
 ## 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
+
+libsigrok_hw_common_la_SOURCES = scpi.c scpi_tcp.c scpi_usbtmc.c
 
-libsigrokhwcommon_la_SOURCES =
+if NEED_RPC
+libsigrok_hw_common_la_SOURCES += scpi_vxi.c vxi_clnt.c vxi_xdr.c
+endif
 
-if LA_SALEAE_LOGIC
-libsigrokhwcommon_la_SOURCES += ezusb.c
+if NEED_SERIAL
+libsigrok_hw_common_la_SOURCES += serial.c scpi_serial.c
 endif
 
-if LA_OLS
-libsigrokhwcommon_la_SOURCES += serial.c
+if NEED_USB
+libsigrok_hw_common_la_SOURCES += ezusb.c usb.c
 endif
 
-libsigrokhwcommon_la_CFLAGS = \
+libsigrok_hw_common_la_LIBADD = dmm/libsigrok_hw_common_dmm.la
+
+libsigrok_hw_common_la_CFLAGS = \
 	-I$(top_srcdir)