X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2FMakefile.am;h=ca717510d5fb0796f95b5cd5c561cd9ba0549e44;hb=f93c89b2140e1f1b67f7822887322376a9b92448;hp=25f476f45c0e77da54292a818cd59df5965b4428;hpb=e10d6e32e4d8766e12b752da6d1806944b0ee85e;p=libsigrok.git

diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am
index 25f476f4..ca717510 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,19 @@
 ## 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 = serial.c
 
-if LA_SALEAE_LOGIC
-libsigrokhwcommon_la_SOURCES += ezusb.c
+if NEED_USB
+libsigrok_hw_common_la_SOURCES += ezusb.c usb.c
 endif
 
-if LA_OLS
-libsigrokhwcommon_la_SOURCES += serial.c
-endif
+libsigrok_hw_common_la_LIBADD = dmm/libsigrok_hw_common_dmm.la
 
-libsigrokhwcommon_la_CFLAGS = \
-	-I$(top_srcdir)/libsigrok
+libsigrok_hw_common_la_CFLAGS = \
+	-I$(top_srcdir)