X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=dea187344335dce455dc128359c0c01c65b093af;hb=ebf6aa306f5993252abb78787502b20134e1593c;hp=4b05175b480870bd89e38f7647d4e8a1bf1f40d2;hpb=13f6da6755cc93d779853ac008ed9c4bcd3045fb;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 4b05175b..dea18734 100644
--- 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,13 @@ 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 \
+	src/minilzo/minilzo.h \
+	src/minilzo/lzoconf.h \
+	src/minilzo/lzodefs.h
+
 # Input modules
 libsigrok_la_SOURCES += \
 	src/input/input.c \
@@ -84,6 +92,10 @@ libsigrok_la_SOURCES += \
 	src/input/vcd.c \
 	src/input/wav.c \
 	src/input/null.c
+if HAVE_INPUT_STF
+libsigrok_la_SOURCES += \
+	src/input/stf.c
+endif
 
 # Output modules
 libsigrok_la_SOURCES += \
@@ -137,6 +149,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 += \
@@ -405,6 +420,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/hung-chang-dso-2100/protocol.c \
 	src/hardware/hung-chang-dso-2100/api.c
 endif
+if HW_ICSTATION_USBRELAY
+src_libdrivers_la_SOURCES += \
+	src/hardware/icstation-usbrelay/protocol.h \
+	src/hardware/icstation-usbrelay/protocol.c \
+	src/hardware/icstation-usbrelay/api.c
+endif
 if HW_IKALOGIC_SCANALOGIC2
 src_libdrivers_la_SOURCES += \
 	src/hardware/ikalogic-scanalogic2/protocol.h \
@@ -746,7 +767,11 @@ EXTRA_DIST = \
 	contrib/vnd.sigrok.session.xml \
 	contrib/60-libsigrok.rules \
 	contrib/61-libsigrok-plugdev.rules \
-	contrib/61-libsigrok-uaccess.rules
+	contrib/61-libsigrok-uaccess.rules \
+	src/minilzo/COPYING \
+	src/minilzo/Makefile \
+	src/minilzo/README.LZO \
+	src/minilzo/testmini.c
 
 if HAVE_CHECK
 TESTS = tests/main