BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Marvin Schmidt 2016-05-13 17:44:12 +02:00 committed by Uwe Hermann
parent 17165513f3
commit c4a1015a29
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

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