Drop link-mso19/nexus-osciprime in preparation for release.

[libsigrok.git] / hardware / Makefile.am

diff --git a/hardware/Makefile.am b/hardware/Makefile.am
index f81e43319c690b929461741100780ecdfad46e7e..bdf4a602de4fba81fee14841f9ed7817dee6000e 100644 (file)
--- 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 \
@@ -30,8 +31,7 @@ SUBDIRS = \
        fx2lafw \
        hantek-dso \
        lascar-el-usb \
-       link-mso19 \
-       nexus-osciprime \
+       mic-985xx \
        openbench-logic-sniffer \
        rigol-ds1xx2 \
        serial-dmm \
@@ -59,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
@@ -87,12 +91,8 @@ 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
+if HW_MIC_985XX
+libsigrokhardware_la_LIBADD += mic-985xx/libsigrok_hw_mic_985xx.la
 endif
 
 if LA_OLS