dreamsourcelab-dslogic: Naming and other consistency fixes.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5501968fa42bfc28d2e848fcc079fd50a0705880..c9b899387684711add4e9cc92ec1b4224d0510f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -272,6 +272,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 +294,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 += \
@@ -544,6 +548,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 +581,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