scpi_usbtmc_libusb.c: Fix two error checks.

[libsigrok.git] / hardware / Makefile.am

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index 3c093b76cc0b278b2a8fa7c8ad7e9a5b67f7da09..02d67ed6ebb148d1a31ed09019e064e65364a51b 100644 (file)
--- a/hardware/Makefile.am
+++ b/hardware/Makefile.am
@@ -21,24 +21,39 @@
 SUBDIRS = \
        agilent-dmm \
        alsa \
+       appa-55ii \
        asix-sigma \
+       atten-pps3xxx \
+       brymen-bm86x \
        brymen-dmm \
+       cem-dt-885x \
+       center-3xx \
        chronovu-la8 \
        colead-slm \
        common \
+       conrad-digi-35-cpu \
        demo \
        fluke-dmm \
        fx2lafw \
+       gmc-mh-1x-2x \
+       hameg-hmo \
        hantek-dso \
+       ikalogic-scanalogic2 \
+       ikalogic-scanaplus \
+       kecheng-kc-330b \
        lascar-el-usb \
        link-mso19 \
        mic-985xx \
-       nexus-osciprime \
+       norma-dmm \
        openbench-logic-sniffer \
-       rigol-ds1xx2 \
+       rigol-ds \
+       saleae-logic16 \
        serial-dmm \
+       sysclk-lwla \
+       teleinfo \
        tondaj-sl-814 \
        uni-t-dmm \
+       uni-t-ut32x \
        victor-dmm \
        zeroplus-logic-cube
 
@@ -47,74 +62,130 @@ 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_APPA_55II
+libsigrokhardware_la_LIBADD += appa-55ii/libsigrok_hw_appa_55ii.la
+endif
+
+if HW_ASIX_SIGMA
+libsigrokhardware_la_LIBADD += asix-sigma/libsigrok_hw_asix_sigma.la
+endif
+
+if HW_ATTEN_PPS3XXX
+libsigrokhardware_la_LIBADD += atten-pps3xxx/libsigrok_hw_atten_pps3xxx.la
+endif
+
+if HW_BRYMEN_BM86X
+libsigrokhardware_la_LIBADD += brymen-bm86x/libsigrok_hw_brymen_bm86x.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
+if HW_CEM_DT_885X
+libsigrokhardware_la_LIBADD += cem-dt-885x/libsigrok_hw_cem_dt_885x.la
+endif
+
+if HW_CENTER_3XX
+libsigrokhardware_la_LIBADD += center-3xx/libsigrok_hw_center_3xx.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_CONRAD_DIGI_35_CPU
+libsigrokhardware_la_LIBADD += conrad-digi-35-cpu/libsigrok_hw_conrad_digi_35_cpu.la
+endif
+
+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 HW_FX2LAFW
+libsigrokhardware_la_LIBADD += fx2lafw/libsigrok_hw_fx2lafw.la
+endif
+
+if HW_GMC_MH_1X_2X
+libsigrokhardware_la_LIBADD += gmc-mh-1x-2x/libsigrok_hw_gmc_mh_1x_2x.la
 endif
 
-if LA_FX2LAFW
-libsigrokhardware_la_LIBADD += fx2lafw/libsigrokhwfx2lafw.la
+if HW_HAMEG_HMO
+libsigrokhardware_la_LIBADD += hameg-hmo/libsigrok_hw_hameg_hmo.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_IKALOGIC_SCANAPLUS
+libsigrokhardware_la_LIBADD += ikalogic-scanaplus/libsigrok_hw_ikalogic_scanaplus.la
+endif
+
+if HW_KECHENG_KC_330B
+libsigrokhardware_la_LIBADD += kecheng-kc-330b/libsigrok_hw_kecheng_kc_330b.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
+if HW_NORMA_DMM
+libsigrokhardware_la_LIBADD += norma-dmm/libsigrok_hw_norma_dmm.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
+if HW_RIGOL_DS
+libsigrokhardware_la_LIBADD += rigol-ds/libsigrok_hw_rigol_ds.la
+endif
+
+if HW_SALEAE_LOGIC16
+libsigrokhardware_la_LIBADD += saleae-logic16/libsigrok_hw_saleae_logic16.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_SYSCLK_LWLA
+libsigrokhardware_la_LIBADD += sysclk-lwla/libsigrok_hw_sysclk_lwla.la
+endif
+
+if HW_TELEINFO
+libsigrokhardware_la_LIBADD += teleinfo/libsigrok_hw_teleinfo.la
 endif
 
 if HW_TONDAJ_SL_814
@@ -125,11 +196,15 @@ if HW_UNI_T_DMM
 libsigrokhardware_la_LIBADD += uni-t-dmm/libsigrok_hw_uni_t_dmm.la
 endif
 
+if HW_UNI_T_UT32X
+libsigrokhardware_la_LIBADD += uni-t-ut32x/libsigrok_hw_uni_t_ut32x.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
+if HW_ZEROPLUS_LOGIC_CUBE
+libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrok_hw_zeroplus.la
 endif