radioshack-dmm: Integrate into serial-dmm

[libsigrok.git] / hardware / Makefile.am

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index d4e67f664b95f142a8e66831c7c299f58d9ce8f5..d63d7ecc6c645dc906a27f901f145e591c33515e 100644 (file)
--- a/hardware/Makefile.am
+++ b/hardware/Makefile.am
@@ -28,12 +28,11 @@ SUBDIRS = \
        demo \
        fluke-dmm \
        fx2lafw \
-       genericdmm \
        hantek-dso \
        link-mso19 \
        openbench-logic-sniffer \
-       radioshack-dmm \
-       tekpower-dmm \
+       serial-dmm \
+       tondaj-sl-814 \
        uni-t-dmm \
        victor-dmm \
        zeroplus-logic-cube
@@ -77,10 +76,6 @@ if LA_FX2LAFW
 libsigrokhardware_la_LIBADD += fx2lafw/libsigrokhwfx2lafw.la
 endif
 
-if HW_GENERICDMM
-libsigrokhardware_la_LIBADD += genericdmm/libsigrokhwgenericdmm.la
-endif
-
 if HW_HANTEK_DSO
 libsigrokhardware_la_LIBADD += hantek-dso/libsigrokhw_hantek_dso.la
 endif
@@ -97,8 +92,12 @@ if HW_RADIOSHACK_DMM
 libsigrokhardware_la_LIBADD += radioshack-dmm/libsigrokhwradioshackdmm.la
 endif
 
-if HW_TEKPOWER_DMM
-libsigrokhardware_la_LIBADD += tekpower-dmm/libsigrokhwtekpowerdmm.la
+if HW_SERIAL_DMM
+libsigrokhardware_la_LIBADD += serial-dmm/libsigrokhwserialdmm.la
+endif
+
+if HW_TONDAJ_SL_814
+libsigrokhardware_la_LIBADD += tondaj-sl-814/libsigrok_hw_tondaj_sl_814.la
 endif
 
 if HW_UNI_T_DMM