configure.ac: libserialport is optional.

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

diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am
index ca3bc8c059640ba60d56e14f9138eb8720fdda7b..de8f06c168baeaea23168a7287ed8ff4f18d3a3f 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,23 @@
 ## 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 =
 
-if LA_SALEAE_LOGIC
-libsigrokhwcommon_la_SOURCES += ezusb.c
+if NEED_SERIAL
+libsigrok_hw_common_la_SOURCES += 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)