proper fix for output_text corner cases

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7445300729937d7ad062aa136811facfa1807cd2..f5fb2b30a4ca730ab904415f6464da1bc6cac6d3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,14 +30,10 @@ libsigrok_la_SOURCES = \
        hwplugin.c \
        filter.c \
        hardware/common/ezusb.c \
+       hardware/common/misc.c \
        hardware/common/serial.c \
-       hardware/openbench-logic-sniffer/ols.c \
-       hardware/saleae-logic/saleae-logic.c \
-       hardware/zeroplus-logic-cube/analyzer.c \
-       hardware/zeroplus-logic-cube/analyzer.h \
-       hardware/zeroplus-logic-cube/gl_usb.c \
-       hardware/zeroplus-logic-cube/gl_usb.h \
-       hardware/zeroplus-logic-cube/zeroplus.c \
+       input/input_binary.c \
+       input/input.c \
        output/output_binary.c \
        output/output_text.c \
        output/output_vcd.c \
@@ -45,7 +41,48 @@ libsigrok_la_SOURCES = \
        output/common.c \
        output/output.c
 
+if LA_ASIX_SIGMA
+libsigrok_la_SOURCES += \
+       hardware/asix-sigma/asix-sigma.c \
+       hardware/asix-sigma/asix-sigma.h
+else
+EXTRA_DIST = \
+       hardware/asix-sigma/asix-sigma.c \
+       hardware/asix-sigma/asix-sigma.h
+endif
+
+if LA_OLS
+libsigrok_la_SOURCES += hardware/openbench-logic-sniffer/ols.c
+else
+EXTRA_DIST = hardware/openbench-logic-sniffer/ols.c
+endif
+
+if LA_SALEAE_LOGIC
+libsigrok_la_SOURCES += hardware/saleae-logic/saleae-logic.c
+else
+EXTRA_DIST = hardware/saleae-logic/saleae-logic.c
+endif
+
+if LA_ZEROPLUS_LOGIC_CUBE
+libsigrok_la_SOURCES += \
+       hardware/zeroplus-logic-cube/analyzer.c \
+       hardware/zeroplus-logic-cube/analyzer.h \
+       hardware/zeroplus-logic-cube/gl_usb.c \
+       hardware/zeroplus-logic-cube/gl_usb.h \
+       hardware/zeroplus-logic-cube/zeroplus.c
+else
+EXTRA_DIST = \
+       hardware/zeroplus-logic-cube/analyzer.c \
+       hardware/zeroplus-logic-cube/analyzer.h \
+       hardware/zeroplus-logic-cube/gl_usb.c \
+       hardware/zeroplus-logic-cube/gl_usb.h \
+       hardware/zeroplus-logic-cube/zeroplus.c
+endif
+
 libsigrok_la_LIBADD = $(LIBOBJS)
 
 include_HEADERS = sigrok.h
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrok.pc
+