chromium-twinkie: add analog VBUS channels

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 731726355ad4b63bcd04e494d4eac4190f39e532..e8c8e40fc3ebe7c1dc034a1971298536f29e10c0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,6 +248,12 @@ src_libdrivers_la_SOURCES += \
        src/hardware/center-3xx/protocol.c \
        src/hardware/center-3xx/api.c
 endif
+if HW_CHROMIUM_TWINKIE
+src_libdrivers_la_SOURCES += \
+       src/hardware/chromium-twinkie/protocol.h \
+       src/hardware/chromium-twinkie/protocol.c \
+       src/hardware/chromium-twinkie/api.c
+endif
 if HW_CHRONOVU_LA
 src_libdrivers_la_SOURCES += \
        src/hardware/chronovu-la/protocol.h \
@@ -544,6 +550,15 @@ noinst_HEADERS = src/libsigrok-internal.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc
 
+mimeappdir = $(datadir)/mime/application
+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 +583,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
@@ -601,6 +619,11 @@ INSTALL_EXTRA =
 UNINSTALL_EXTRA =
 CLEAN_EXTRA =
 
+libsigrok-uninstall:
+       -rmdir $(DESTDIR)$(includedir)/libsigrok
+
+UNINSTALL_EXTRA += libsigrok-uninstall
+
 if BINDINGS_CXX
 
 lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la
@@ -643,6 +666,11 @@ cxx-clean:
 
 CLEAN_EXTRA += cxx-clean
 
+cxx-uninstall:
+       -rmdir $(DESTDIR)$(includedir)/libsigrokcxx
+
+UNINSTALL_EXTRA += cxx-uninstall
+
 endif
 
 CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
@@ -825,7 +853,7 @@ endif
 
 all-local: $(BUILD_EXTRA)
 install-exec-local: $(INSTALL_EXTRA)
-uninstall-local: $(UNINSTALL_EXTRA)
+uninstall-hook: $(UNINSTALL_EXTRA)
 clean-local: $(CLEAN_EXTRA)
 
 .PHONY: dist-changelog