X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2FMakefile.am;h=871140056ad4cf5576a107c611c63739eb949407;hb=5097b0d0912165429aceddb5febbf68467b623f5;hp=7e18acfe1bc75eb71676273cc914fcc476f668b5;hpb=340f6e7aeaf0c6cbbb27c5b535787bd09407994b;p=libsigrok.git

diff --git a/output/Makefile.am b/output/Makefile.am
index 7e18acfe..87114005 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -17,19 +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_gnuplot.c \
-	common.c \
+	binary.c \
+	vcd.c \
+	ols.c \
+	gnuplot.c \
+	chronovu_la8.c \
+	csv.c \
 	output.c
 
+# Temporarily disabled: output_analog.c
+
 libsigrokoutput_la_CFLAGS = \
-	-I$(top_srcdir)/libsigrok
+	-I$(top_srcdir)
+
+libsigrokoutput_la_LIBADD = \
+	text/libsigrokoutputtext.la