Rename sigrok-logo-notext.png to libsigrok_112x112.png.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aaff5d2fb3b38cc6eb91398a5a19b81f06f56b57..1afed1e1f9f89bfcf544984a02310bea0ba81a7b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -376,6 +376,12 @@ src_libdrivers_la_SOURCES += \
        src/hardware/lecroy-logicstudio/protocol.c \
        src/hardware/lecroy-logicstudio/api.c
 endif
+if HW_LECROY_XSTREAM
+src_libdrivers_la_SOURCES += \
+       src/hardware/lecroy-xstream/protocol.h \
+       src/hardware/lecroy-xstream/protocol.c \
+       src/hardware/lecroy-xstream/api.c
+endif
 if HW_MANSON_HCS_3XXX
 src_libdrivers_la_SOURCES += \
        src/hardware/manson-hcs-3xxx/protocol.h \
@@ -562,7 +568,7 @@ EXTRA_DIST = \
        bindings/swig/classes.i \
        bindings/swig/doc.py \
        bindings/swig/templates.i \
-       contrib/sigrok-logo-notext.png \
+       contrib/libsigrok_112x112.png \
        contrib/z60_libsigrok.rules
 
 if HAVE_CHECK
@@ -595,6 +601,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
@@ -637,6 +648,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
@@ -819,7 +835,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