serial: move sr_serial_extract_options() out of "have serial comm" condition

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bdd3c61b17f628a0b193795d824ba2ebf5ddcfac..67b73b5df00c55dfc99aa08ac72ec95cb9189196 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,8 @@ AM_CPPFLAGS = $(local_includes) $(global_defs)
 
 # The tests CFLAGS are a superset of the libsigrok CFLAGS, and the
 # python bindings CFLAGS are a superset of the C++ bindings CFLAGS.
-AM_CFLAGS = $(SR_EXTRA_CFLAGS) $(SR_WFLAGS) $(TESTS_CFLAGS)
+SR_MINILZO_CFLAGS = -DMINILZO_HAVE_CONFIG_H
+AM_CFLAGS = $(SR_EXTRA_CFLAGS) $(SR_WFLAGS) $(SR_MINILZO_CFLAGS) $(TESTS_CFLAGS)
 AM_CXXFLAGS = $(SR_WXXFLAGS) $(LIBSIGROKCXX_CFLAGS)
 
 lib_LTLIBRARIES = libsigrok.la
@@ -70,6 +71,10 @@ libsigrok_la_SOURCES = \
        src/std.c \
        src/sw_limits.c
 
+# Support code, shared among input and driver modules
+libsigrok_la_SOURCES += \
+       src/minilzo/minilzo.c
+
 # Input modules
 libsigrok_la_SOURCES += \
        src/input/input.c \
@@ -80,6 +85,7 @@ libsigrok_la_SOURCES += \
        src/input/logicport.c \
        src/input/raw_analog.c \
        src/input/saleae.c \
+       src/input/stf.c \
        src/input/trace32_ad.c \
        src/input/vcd.c \
        src/input/wav.c \
@@ -137,6 +143,9 @@ libsigrok_la_SOURCES += \
        src/serial_hid_victor.c \
        src/serial_libsp.c \
        src/scpi/scpi_serial.c
+else
+libsigrok_la_SOURCES += \
+       src/serial.c
 endif
 if NEED_USB
 libsigrok_la_SOURCES += \
@@ -166,6 +175,7 @@ libsigrok_la_SOURCES += \
        src/dmm/asycii.c \
        src/dmm/bm25x.c \
        src/dmm/bm52x.c \
+       src/dmm/bm85x.c \
        src/dmm/bm86x.c \
        src/dmm/dtm0660.c \
        src/dmm/eev121gw.c \
@@ -174,6 +184,7 @@ libsigrok_la_SOURCES += \
        src/dmm/fs9922.c \
        src/dmm/m2110.c \
        src/dmm/metex14.c \
+       src/dmm/mm38xr.c \
        src/dmm/ms2115b.c \
        src/dmm/ms8250d.c \
        src/dmm/rs9lcd.c \
@@ -230,6 +241,12 @@ src_libdrivers_la_SOURCES += \
        src/hardware/arachnid-labs-re-load-pro/protocol.c \
        src/hardware/arachnid-labs-re-load-pro/api.c
 endif
+if HW_ASIX_OMEGA_RTM_CLI
+src_libdrivers_la_SOURCES += \
+       src/hardware/asix-omega-rtm-cli/protocol.h \
+       src/hardware/asix-omega-rtm-cli/protocol.c \
+       src/hardware/asix-omega-rtm-cli/api.c
+endif
 if HW_ASIX_SIGMA
 src_libdrivers_la_SOURCES += \
        src/hardware/asix-sigma/protocol.h \
@@ -259,13 +276,6 @@ src_libdrivers_la_SOURCES += \
        src/hardware/beaglelogic/beaglelogic_native.c \
        src/hardware/beaglelogic/beaglelogic_tcp.c
 endif
-if HW_BRYMEN_DMM
-src_libdrivers_la_SOURCES += \
-       src/hardware/brymen-dmm/parser.c \
-       src/hardware/brymen-dmm/protocol.h \
-       src/hardware/brymen-dmm/protocol.c \
-       src/hardware/brymen-dmm/api.c
-endif
 if HW_CEM_DT_885X
 src_libdrivers_la_SOURCES += \
        src/hardware/cem-dt-885x/protocol.h \
@@ -296,6 +306,12 @@ src_libdrivers_la_SOURCES += \
        src/hardware/conrad-digi-35-cpu/protocol.c \
        src/hardware/conrad-digi-35-cpu/api.c
 endif
+if HW_DCTTECH_USBRELAY
+src_libdrivers_la_SOURCES += \
+       src/hardware/dcttech-usbrelay/protocol.h \
+       src/hardware/dcttech-usbrelay/protocol.c \
+       src/hardware/dcttech-usbrelay/api.c
+endif
 if HW_DEMO
 src_libdrivers_la_SOURCES += \
        src/hardware/demo/protocol.h \
@@ -386,6 +402,12 @@ src_libdrivers_la_SOURCES += \
        src/hardware/hp-3478a/protocol.c \
        src/hardware/hp-3478a/api.c
 endif
+if HW_HP_59306A
+src_libdrivers_la_SOURCES += \
+       src/hardware/hp-59306a/protocol.h \
+       src/hardware/hp-59306a/protocol.c \
+       src/hardware/hp-59306a/api.c
+endif
 if HW_HUNG_CHANG_DSO_2100
 src_libdrivers_la_SOURCES += \
        src/hardware/hung-chang-dso-2100/protocol.h \