X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2FMakefile.am;h=ca717510d5fb0796f95b5cd5c561cd9ba0549e44;hb=b979d0c9cbf3a697c0ac4b06031ffb18b5f60006;hp=e8a708f31e899b3acb3f7864e8e25eb26e6faad7;hpb=340f6e7aeaf0c6cbbb27c5b535787bd09407994b;p=libsigrok.git

diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am
index e8a708f3..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,14 +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
+
+libsigrok_hw_common_la_SOURCES = serial.c
+
+if NEED_USB
+libsigrok_hw_common_la_SOURCES += ezusb.c usb.c
+endif
 
-libsigrokhwcommon_la_SOURCES = \
-	ezusb.c \
-	misc.c \
-	serial.c
+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)