unify sr_datafeed_meta_* into one struct containing sr_config

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

diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am
index ca3bc8c059640ba60d56e14f9138eb8720fdda7b..308430642a109b0cc7358d620f99bcd5be464a09 100644 (file)
--- a/hardware/common/Makefile.am
+++ b/hardware/common/Makefile.am
@@ -17,19 +17,25 @@
 ## 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
 
-libsigrokhwcommon_la_SOURCES =
+libsigrokhwcommon_la_SOURCES = usb.c
 
-if LA_SALEAE_LOGIC
+if NEED_EZUSB
 libsigrokhwcommon_la_SOURCES += ezusb.c
 endif
 
-if LA_OLS
+if NEED_SERIAL
 libsigrokhwcommon_la_SOURCES += serial.c
 endif
 
+libsigrokhwcommon_la_LIBADD = 
+
+libsigrokhwcommon_la_LIBADD += dmm/libsigrok_hw_common_dmm.la
+
 libsigrokhwcommon_la_CFLAGS = \
        -I$(top_srcdir)