From: Marvin Schmidt <redacted>
Date: Fri, 13 May 2016 15:44:12 +0000 (+0200)
Subject: build: Fix distribution of Ruby bindings
X-Git-Tag: libsigrok-0.5.0~418
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c4a1015a2951b85098e50915c953593025df5726;p=libsigrok.git

build: Fix distribution of Ruby bindings

The bindings file was not listed in EXTRA_DIST and therefore not
distributed. We also need to provide an target to uninstall the Ruby
bindings and add it to UNINSTALL_EXTRA in order to make `make distcheck`
happy.

This fixes bug #741
---

diff --git a/Makefile.am b/Makefile.am
index 5db56f9e..85f880e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -530,6 +530,7 @@ EXTRA_DIST = \
 	bindings/python/sigrok/__init__.py \
 	bindings/python/sigrok/core/__init__.py \
 	bindings/python/sigrok/core/classes.i \
+	bindings/ruby/classes.i \
 	bindings/java/Doxyfile \
 	bindings/java/org/sigrok/core/classes/classes.i \
 	bindings/java/org/sigrok/core/interfaces/DatafeedCallback.java \
@@ -712,6 +713,9 @@ ruby-install: $(REXT)
 	$(INSTALL) -d $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
 	$(INSTALL) $< $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
 
+ruby-uninstall:
+	rm -f $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)/sigrok.$(RUBY_DLEXT)
+
 ruby-clean:
 	-$(AM_V_at)rm -fr $(RDIR)/doc
 	-$(AM_V_at)rm -f $(REXT) $(ROBJ) $(RWRAP) $(RDOC)
@@ -721,6 +725,7 @@ ruby-doc: $(RWRAP)
 
 BUILD_EXTRA += ruby-build
 INSTALL_EXTRA += ruby-install
+UNINSTALL_EXTRA += ruby-uninstall
 CLEAN_EXTRA += ruby-clean
 
 endif