fx2lafw: Allow matching USB descriptor strings as well as VID/PID.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1cc6b35f04f1d37124290a88af7a547fa8a48c18..a88d264b3615fb9c8f93ab08d730cec2d8e8a174 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ libsigrok_la_SOURCES = \
        session_file.c \
        session_driver.c \
        hwdriver.c \
-       filter.c \
        strutil.c \
        log.c \
        version.c \
@@ -50,19 +49,17 @@ libsigrok_la_SOURCES += \
 
 # Output formats
 libsigrok_la_SOURCES += \
-       output/binary.c \
+       output/output.c \
+       output/analog.c \
+       output/ascii.c \
        output/bits.c \
-       output/vcd.c \
-       output/ols.c \
-       output/gnuplot.c \
-       output/chronovu_la8.c \
+       output/binary.c \
        output/csv.c \
-       output/analog.c \
-       output/output.c \
-       output/text/text.c \
-       output/text/text.h \
+       output/chronovu_la8.c \
+       output/gnuplot.c \
        output/hex.c \
-       output/text/ascii.c
+       output/ols.c \
+       output/vcd.c
 
 # Hardware (common files)
 libsigrok_la_SOURCES += \
@@ -108,12 +105,6 @@ libsigrok_la_SOURCES += \
        hardware/agilent-dmm/agilent-dmm.h \
        hardware/agilent-dmm/sched.c
 endif
-if HW_ALSA
-libsigrok_la_SOURCES += \
-       hardware/alsa/protocol.h \
-       hardware/alsa/protocol.c \
-       hardware/alsa/api.c
-endif
 if HW_APPA_55II
 libsigrok_la_SOURCES += \
        hardware/appa-55ii/protocol.h \