X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=aec16d122fe0fa88af2b7df260942f6d83ca0787;hb=05199c0ac9f15f229d43e50e86c4c1eadc55deac;hp=5501968fa42bfc28d2e848fcc079fd50a0705880;hpb=09b2ca47e6b3d510d5a7cb64ab99fbc7a7de84a3;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 5501968f..aec16d12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ lib_LTLIBRARIES = libsigrok.la
 # Backend files
 libsigrok_la_SOURCES = \
 	src/backend.c \
+	src/conversion.c \
 	src/device.c \
 	src/session.c \
 	src/session_file.c \
@@ -272,6 +273,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/demo/protocol.c \
 	src/hardware/demo/api.c
 endif
+if HW_DREAMSOURCELAB_DSLOGIC
+src_libdrivers_la_SOURCES += \
+	src/hardware/dreamsourcelab-dslogic/protocol.h \
+	src/hardware/dreamsourcelab-dslogic/protocol.c \
+	src/hardware/dreamsourcelab-dslogic/api.c
+endif
 if HW_FLUKE_DMM
 src_libdrivers_la_SOURCES += \
 	src/hardware/fluke-dmm/protocol.h \
@@ -288,9 +295,7 @@ if HW_FX2LAFW
 src_libdrivers_la_SOURCES += \
 	src/hardware/fx2lafw/protocol.h \
 	src/hardware/fx2lafw/protocol.c \
-	src/hardware/fx2lafw/api.c \
-	src/hardware/fx2lafw/dslogic.c \
-	src/hardware/fx2lafw/dslogic.h
+	src/hardware/fx2lafw/api.c
 endif
 if HW_GMC_MH_1X_2X
 src_libdrivers_la_SOURCES += \
@@ -448,6 +453,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/saleae-logic16/protocol.c \
 	src/hardware/saleae-logic16/api.c
 endif
+if HW_SALEAE_LOGIC_PRO
+src_libdrivers_la_SOURCES += \
+	src/hardware/saleae-logic-pro/protocol.h \
+	src/hardware/saleae-logic-pro/protocol.c \
+	src/hardware/saleae-logic-pro/api.c
+endif
 if HW_SCPI_PPS
 src_libdrivers_la_SOURCES += \
 	src/hardware/scpi-pps/protocol.h \
@@ -544,6 +555,15 @@ noinst_HEADERS = src/libsigrok-internal.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc
 
+mimeappdir = $(datadir)/mime/packages
+mimeapp_DATA = contrib/vnd.sigrok.session.xml
+
+mimeicondir = $(datadir)/icons/hicolor/48x48/mimetypes
+mimeicon_DATA = contrib/libsigrok.png
+
+mimeiconscalabledir = $(datadir)/icons/hicolor/scalable/mimetypes
+mimeiconscalable_DATA = contrib/libsigrok.svg
+
 EXTRA_DIST = \
 	Doxyfile \
 	HACKING \
@@ -568,7 +588,10 @@ EXTRA_DIST = \
 	bindings/swig/classes.i \
 	bindings/swig/doc.py \
 	bindings/swig/templates.i \
-	contrib/sigrok-logo-notext.png \
+	contrib/libsigrok_112x112.png \
+	contrib/libsigrok.png \
+	contrib/libsigrok.svg \
+	contrib/vnd.sigrok.session.xml \
 	contrib/z60_libsigrok.rules
 
 if HAVE_CHECK