X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2FMakefile.am;h=66b31fcf3382a09b9accb6cd647d4f6158504851;hb=6ac5f8922e63d1f584a69969190af0389a88d812;hp=74b92f111df36c8839fd3bd5d9bfd31dca1b86be;hpb=07c81bfad119a4ea66c76cc830506ce3b381b4c5;p=libsigrok.git

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index 74b92f11..66b31fcf 100644
--- a/hardware/Makefile.am
+++ b/hardware/Makefile.am
@@ -2,6 +2,7 @@
 ## This file is part of the sigrok project.
 ##
 ## Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,11 +19,21 @@
 ##
 
 SUBDIRS = \
+	agilent-dmm \
+	alsa \
 	asix-sigma \
+	chronovu-la8 \
 	common \
 	demo \
+	fluke-dmm \
+	fx2lafw \
+	genericdmm \
+	hantek-dso \
+	link-mso19 \
 	openbench-logic-sniffer \
-	saleae-logic \
+	radioshack-dmm \
+	tekpower-dmm \
+	uni-t-dmm \
 	zeroplus-logic-cube
 
 noinst_LTLIBRARIES = libsigrokhardware.la
@@ -32,24 +43,60 @@ libsigrokhardware_la_SOURCES =
 libsigrokhardware_la_LIBADD = \
 	common/libsigrokhwcommon.la
 
-if LA_DEMO
-libsigrokhardware_la_LIBADD += demo/libsigrokhwdemo.la
+if HW_AGILENT_DMM
+libsigrokhardware_la_LIBADD += agilent-dmm/libsigrokhwagilentdmm.la
+endif
+
+if LA_ALSA
+libsigrokhardware_la_LIBADD += alsa/libsigrokhwalsa.la
 endif
 
 if LA_ASIX_SIGMA
 libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la
 endif
 
-# if LA_LINK_MSO19
-# libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la
-# endif
+if LA_CHRONOVU_LA8
+libsigrokhardware_la_LIBADD += chronovu-la8/libsigrokhwchronovula8.la
+endif
+
+if LA_DEMO
+libsigrokhardware_la_LIBADD += demo/libsigrokhwdemo.la
+endif
+
+if HW_FLUKE_DMM
+libsigrokhardware_la_LIBADD += fluke-dmm/libsigrokhwflukedmm.la
+endif
+
+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
+endif
 
 if LA_OLS
 libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
 endif
 
-if LA_SALEAE_LOGIC
-libsigrokhardware_la_LIBADD += saleae-logic/libsigrokhwsaleaelogic.la
+if HW_RADIOSHACK_DMM
+libsigrokhardware_la_LIBADD += radioshack-dmm/libsigrokhwradioshackdmm.la
+endif
+
+if HW_TEKPOWER_DMM
+libsigrokhardware_la_LIBADD += tekpower-dmm/libsigrokhwtekpowerdmm.la
+endif
+
+if HW_UNI_T_DMM
+libsigrokhardware_la_LIBADD += uni-t-dmm/libsigrok_hw_uni_t_dmm.la
 endif
 
 if LA_ZEROPLUS_LOGIC_CUBE