X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2FMakefile.am;h=f64dac4bf3c458fbb946a3282d5c7b8d2210c965;hb=16e76baec9b1df806e46d4da61269375924ab950;hp=0a3158cf96db9f4c4f7cce783ff007f3652f7430;hpb=35a078bce5cff9b8ff221a9930d271ec90e20ec4;p=libsigrok.git

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index 0a3158cf..f64dac4b 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,6 +22,7 @@ SUBDIRS = \
 	agilent-dmm \
 	alsa \
 	asix-sigma \
+	brymen-dmm \
 	chronovu-la8 \
 	colead-slm \
 	common \
@@ -29,10 +30,13 @@ SUBDIRS = \
 	fluke-dmm \
 	fx2lafw \
 	hantek-dso \
+	ikalogic-scanalogic2 \
 	lascar-el-usb \
 	link-mso19 \
+	mic-985xx \
 	nexus-osciprime \
 	openbench-logic-sniffer \
+	rigol-ds1xx2 \
 	serial-dmm \
 	tondaj-sl-814 \
 	uni-t-dmm \
@@ -44,62 +48,78 @@ noinst_LTLIBRARIES = libsigrokhardware.la
 libsigrokhardware_la_SOURCES =
 
 libsigrokhardware_la_LIBADD = \
-	common/libsigrokhwcommon.la
+	common/libsigrok_hw_common.la
 
 if HW_AGILENT_DMM
-libsigrokhardware_la_LIBADD += agilent-dmm/libsigrokhwagilentdmm.la
+libsigrokhardware_la_LIBADD += agilent-dmm/libsigrok_hw_agilent_dmm.la
 endif
 
 if HW_ALSA
-libsigrokhardware_la_LIBADD += alsa/libsigrokhwalsa.la
+libsigrokhardware_la_LIBADD += alsa/libsigrok_hw_alsa.la
 endif
 
-if LA_ASIX_SIGMA
-libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la
+if HW_ASIX_SIGMA
+libsigrokhardware_la_LIBADD += asix-sigma/libsigrok_hw_asix_sigma.la
 endif
 
-if LA_CHRONOVU_LA8
-libsigrokhardware_la_LIBADD += chronovu-la8/libsigrokhwchronovula8.la
+if HW_BRYMEN_DMM
+libsigrokhardware_la_LIBADD += brymen-dmm/libsigrok_hw_brymen_dmm.la
+endif
+
+if HW_CHRONOVU_LA8
+libsigrokhardware_la_LIBADD += chronovu-la8/libsigrok_hw_chronovu_la8.la
 endif
 
 if HW_COLEAD_SLM
 libsigrokhardware_la_LIBADD += colead-slm/libsigrok_hw_colead_slm.la
 endif
 
-if LA_DEMO
-libsigrokhardware_la_LIBADD += demo/libsigrokhwdemo.la
+if HW_DEMO
+libsigrokhardware_la_LIBADD += demo/libsigrok_hw_demo.la
 endif
 
 if HW_FLUKE_DMM
-libsigrokhardware_la_LIBADD += fluke-dmm/libsigrokhwflukedmm.la
+libsigrokhardware_la_LIBADD += fluke-dmm/libsigrok_hw_fluke_dmm.la
 endif
 
-if LA_FX2LAFW
-libsigrokhardware_la_LIBADD += fx2lafw/libsigrokhwfx2lafw.la
+if HW_FX2LAFW
+libsigrokhardware_la_LIBADD += fx2lafw/libsigrok_hw_fx2lafw.la
 endif
 
 if HW_HANTEK_DSO
-libsigrokhardware_la_LIBADD += hantek-dso/libsigrokhw_hantek_dso.la
+libsigrokhardware_la_LIBADD += hantek-dso/libsigrok_hw_hantek_dso.la
+endif
+
+if HW_IKALOGIC_SCANALOGIC2
+libsigrokhardware_la_LIBADD += ikalogic-scanalogic2/libsigrok_hw_ikalogic_scanalogic2.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
+if HW_LINK_MSO19
+libsigrokhardware_la_LIBADD += link-mso19/libsigrok_hw_link_mso_19.la
+endif
+
+if HW_MIC_985XX
+libsigrokhardware_la_LIBADD += mic-985xx/libsigrok_hw_mic_985xx.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
+if HW_OLS
+libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrok_hw_ols.la
+endif
+
+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
+libsigrokhardware_la_LIBADD += serial-dmm/libsigrok_hw_serial_dmm.la
 endif
 
 if HW_TONDAJ_SL_814
@@ -114,7 +134,7 @@ 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
+if HW_ZEROPLUS_LOGIC_CUBE
+libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrok_hw_zeroplus.la
 endif