Initial support for CSV as output format.

[libsigrok.git] / output / Makefile.am

diff --git a/output/Makefile.am b/output/Makefile.am
index 98a21da633eccca3ae43139da9f9c87232c1b805..d54464f37d381c261eef027a6224cbf2c2ec801b 100644 (file)
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -17,21 +17,25 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+SUBDIRS = text
 
 # Local lib, this is NOT meant to be installed!
 noinst_LTLIBRARIES = libsigrokoutput.la
 
 libsigrokoutput_la_SOURCES = \
        output_binary.c \
-       output_text.c \
        output_vcd.c \
        output_ols.c \
        output_gnuplot.c \
-       output_analog.c \
-       common.c \
+       output_chronovu_la8.c \
+       output_csv.c \
        output.c
 
+# Temporarily disabled: output_analog.c
+
 libsigrokoutput_la_CFLAGS = \
        -I$(top_srcdir)/libsigrok
 
+libsigrokoutput_la_LIBADD = \
+       text/libsigrokoutputtext.la
+