X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2FMakefile.am;h=ca717510d5fb0796f95b5cd5c561cd9ba0549e44;hb=32be5b22462fa271c8837694d7f242a0bda2f2f7;hp=e8d670ce28733a704dbb40259a3b44a9b8e9b939;hpb=28b9dd18611da8e16038d62d58195bdef91552eb;p=libsigrok.git

diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am
index e8d670ce..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 NEED_EZUSB
-libsigrokhwcommon_la_SOURCES += ezusb.c
+if NEED_USB
+libsigrok_hw_common_la_SOURCES += ezusb.c usb.c
 endif
 
-if NEED_SERIAL
-libsigrokhwcommon_la_SOURCES += serial.c
-endif
+libsigrok_hw_common_la_LIBADD = dmm/libsigrok_hw_common_dmm.la
 
-libsigrokhwcommon_la_CFLAGS = \
+libsigrok_hw_common_la_CFLAGS = \
 	-I$(top_srcdir)