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

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index 4753d8ea..bdf4a602 100644
--- a/hardware/Makefile.am
+++ b/hardware/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>
 ## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
@@ -22,19 +22,22 @@ SUBDIRS = \
 	agilent-dmm \
 	alsa \
 	asix-sigma \
+	brymen-dmm \
 	chronovu-la8 \
 	colead-slm \
 	common \
 	demo \
 	fluke-dmm \
 	fx2lafw \
-	genericdmm \
 	hantek-dso \
-	link-mso19 \
+	lascar-el-usb \
+	mic-985xx \
 	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
 
@@ -56,6 +59,10 @@ if LA_ASIX_SIGMA
 libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la
 endif
 
+if HW_BRYMEN_DMM
+libsigrokhardware_la_LIBADD += brymen-dmm/libsigrok_hw_brymen_dmm.la
+endif
+
 if LA_CHRONOVU_LA8
 libsigrokhardware_la_LIBADD += chronovu-la8/libsigrokhwchronovula8.la
 endif
@@ -76,34 +83,42 @@ 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 LA_LINK_MSO19
-libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la
+if HW_LASCAR_EL_USB
+libsigrokhardware_la_LIBADD += lascar-el-usb/libsigrok_hw_lascar_el_usb.la
+endif
+
+if HW_MIC_985XX
+libsigrokhardware_la_LIBADD += mic-985xx/libsigrok_hw_mic_985xx.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