X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=322be597dbc3cabc2627a3f0f7acdf77cf5e7d9d;hb=00ebcbf48a775e56b6e73a39e69af390db547865;hp=481bbe3ccff9acd44b6bc0d6795ed807a3b06adf;hpb=3b15586812e47e885ed69e3cd1188b1ccf25f807;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 481bbe3c..322be597 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,10 @@ libsigrok_la_SOURCES = \
 	session.c \
 	session_file.c \
 	session_driver.c \
+	drivers.c \
 	hwdriver.c \
+	trigger.c \
+	soft-trigger.c \
 	strutil.c \
 	log.c \
 	version.c \
@@ -49,23 +52,22 @@ libsigrok_la_SOURCES += \
 
 # Output formats
 libsigrok_la_SOURCES += \
-	output/binary.c \
+	output/output.c \
+	output/analog.c \
+	output/ascii.c \
 	output/bits.c \
-	output/vcd.c \
-	output/ols.c \
-	output/gnuplot.c \
-	output/chronovu_la8.c \
+	output/binary.c \
 	output/csv.c \
-	output/analog.c \
-	output/output.c \
+	output/chronovu_la8.c \
+	output/gnuplot.c \
 	output/hex.c \
-	output/ascii.c
+	output/ols.c \
+	output/vcd.c
 
 # Hardware (common files)
 libsigrok_la_SOURCES += \
 	hardware/common/scpi.c \
-	hardware/common/scpi_tcp.c \
-	hardware/common/scpi_usbtmc.c
+	hardware/common/scpi_tcp.c
 if NEED_RPC
 libsigrok_la_SOURCES += \
 	hardware/common/scpi_vxi.c \
@@ -105,12 +107,6 @@ libsigrok_la_SOURCES += \
 	hardware/agilent-dmm/agilent-dmm.h \
 	hardware/agilent-dmm/sched.c
 endif
-if HW_ALSA
-libsigrok_la_SOURCES += \
-	hardware/alsa/protocol.h \
-	hardware/alsa/protocol.c \
-	hardware/alsa/api.c
-endif
 if HW_APPA_55II
 libsigrok_la_SOURCES += \
 	hardware/appa-55ii/protocol.h \
@@ -229,11 +225,11 @@ libsigrok_la_SOURCES += \
 	hardware/lascar-el-usb/protocol.c \
 	hardware/lascar-el-usb/api.c
 endif
-if HW_LINK_MSO19
+if HW_MANSON_HCS_3XXX
 libsigrok_la_SOURCES += \
-	hardware/link-mso19/protocol.h \
-	hardware/link-mso19/protocol.c \
-	hardware/link-mso19/api.c
+	hardware/manson-hcs-3xxx/protocol.h \
+	hardware/manson-hcs-3xxx/protocol.c \
+	hardware/manson-hcs-3xxx/api.c
 endif
 if HW_MIC_985XX
 libsigrok_la_SOURCES += \
@@ -241,13 +237,19 @@ libsigrok_la_SOURCES += \
 	hardware/mic-985xx/protocol.c \
 	hardware/mic-985xx/api.c
 endif
+if HW_MOTECH_LPS_30X
+libsigrok_la_SOURCES += \
+	hardware/motech-lps-30x/protocol.h \
+	hardware/motech-lps-30x/protocol.c \
+	hardware/motech-lps-30x/api.c
+endif
 if HW_NORMA_DMM
 libsigrok_la_SOURCES += \
 	hardware/norma-dmm/protocol.h \
 	hardware/norma-dmm/protocol.c \
 	hardware/norma-dmm/api.c
 endif
-if HW_OLS
+if HW_OPENBENCH_LOGIC_SNIFFER
 libsigrok_la_SOURCES += \
 	hardware/openbench-logic-sniffer/protocol.h \
 	hardware/openbench-logic-sniffer/protocol.c \
@@ -285,6 +287,12 @@ libsigrok_la_SOURCES += \
 	hardware/teleinfo/protocol.c \
 	hardware/teleinfo/api.c
 endif
+if HW_TESTO
+libsigrok_la_SOURCES += \
+	hardware/testo/protocol.h \
+	hardware/testo/protocol.c \
+	hardware/testo/api.c
+endif
 if HW_TONDAJ_SL_814
 libsigrok_la_SOURCES += \
 	hardware/tondaj-sl-814/protocol.h \
@@ -325,7 +333,10 @@ libsigrok_la_LIBADD = $(LIBOBJS)
 libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
 library_includedir = $(includedir)/libsigrok
-library_include_HEADERS = libsigrok.h proto.h version.h
+library_include_HEADERS = \
+	include/libsigrok/libsigrok.h \
+	include/libsigrok/proto.h \
+	include/libsigrok/version.h
 noinst_HEADERS = libsigrok-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig