X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2FMakefile.am;h=f81e43319c690b929461741100780ecdfad46e7e;hb=fb6e5ba8c7da4cc16eda03e3ffd0a97780655442;hp=4753d8ea7d53a429f6f38e0ba62d3a939d3cc767;hpb=4d729ddcaf395de1d04af93dd5ea569cfbc17de4;p=libsigrok.git

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index 4753d8ea..f81e4331 100644
--- a/hardware/Makefile.am
+++ b/hardware/Makefile.am
@@ -28,13 +28,16 @@ SUBDIRS = \
 	demo \
 	fluke-dmm \
 	fx2lafw \
-	genericdmm \
 	hantek-dso \
+	lascar-el-usb \
 	link-mso19 \
+	nexus-osciprime \
 	openbench-logic-sniffer \
-	radioshack-dmm \
-	tekpower-dmm \
+	rigol-ds1xx2 \
+	serial-dmm \
+	tondaj-sl-814 \
 	uni-t-dmm \
+	victor-dmm \
 	zeroplus-logic-cube
 
 noinst_LTLIBRARIES = libsigrokhardware.la
@@ -48,7 +51,7 @@ if HW_AGILENT_DMM
 libsigrokhardware_la_LIBADD += agilent-dmm/libsigrokhwagilentdmm.la
 endif
 
-if LA_ALSA
+if HW_ALSA
 libsigrokhardware_la_LIBADD += alsa/libsigrokhwalsa.la
 endif
 
@@ -76,34 +79,46 @@ 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
 
+if HW_LASCAR_EL_USB
+libsigrokhardware_la_LIBADD += lascar-el-usb/libsigrok_hw_lascar_el_usb.la
+endif
+
 if LA_LINK_MSO19
 libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la
 endif
 
+if HW_NEXUS_OSCIPRIME
+libsigrokhardware_la_LIBADD += nexus-osciprime/libsigrok_hw_nexus_osciprime.la
+endif
+
 if LA_OLS
 libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
 endif
 
-if HW_RADIOSHACK_DMM
-libsigrokhardware_la_LIBADD += radioshack-dmm/libsigrokhwradioshackdmm.la
+if HW_RIGOL_DS1XX2
+libsigrokhardware_la_LIBADD += rigol-ds1xx2/libsigrok_hw_rigol_ds1xx2.la
+endif
+
+if HW_SERIAL_DMM
+libsigrokhardware_la_LIBADD += serial-dmm/libsigrokhwserialdmm.la
 endif
 
-if HW_TEKPOWER_DMM
-libsigrokhardware_la_LIBADD += tekpower-dmm/libsigrokhwtekpowerdmm.la
+if HW_TONDAJ_SL_814
+libsigrokhardware_la_LIBADD += tondaj-sl-814/libsigrok_hw_tondaj_sl_814.la
 endif
 
 if HW_UNI_T_DMM
 libsigrokhardware_la_LIBADD += uni-t-dmm/libsigrok_hw_uni_t_dmm.la
 endif
 
+if HW_VICTOR_DMM
+libsigrokhardware_la_LIBADD += victor-dmm/libsigrok_hw_victor_dmm.la
+endif
+
 if LA_ZEROPLUS_LOGIC_CUBE
 libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrokhwzeroplus.la
 endif