From: Aurelien Jacobs <redacted>
Date: Thu, 12 May 2016 21:08:21 +0000 (+0200)
Subject: ruby: Fix out-of-tree build of the bindings.
X-Git-Tag: libsigrok-0.5.0~419
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=17165513f3d18cc56d1918126818fb30596898bd;p=libsigrok.git

ruby: Fix out-of-tree build of the bindings.

This closes bug #797.
---

diff --git a/Makefile.am b/Makefile.am
index 7f0cab11..5db56f9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -688,19 +688,20 @@ ROBJ = $(RWRAP:.cpp=.o)
 REXT = $(RDIR)/sigrok.$(RUBY_DLEXT)
 
 $(RDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+	$(AM_V_at)test -d $(RDIR) || $(MKDIR_P) $(RDIR)
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py ruby $(CPPXMLDOC) > $@
 
 $(RWRAP): $(RDIR)/classes.i $(RDOC) \
 		bindings/swig/classes.i bindings/swig/templates.i \
 		bindings/swig/enums.i
-	$(AM_V_GEN)$(SWIG) -ruby -c++ -Ibindings -Ibindings/cxx/include $(swig_defs) -o $@ $<
+	$(AM_V_GEN)$(SWIG) -ruby -c++ -Ibindings -Ibindings/cxx/include -I$(RDIR) $(local_includes) $(swig_defs) -o $@ $<
 
 $(ROBJ): $(RWRAP) \
 		$(library_include_HEADERS) \
 		$(nodist_library_include_HEADERS) \
 		$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS)
-	$(AM_V_CXX)$(CXX) $(RBSIGROK_CFLAGS) -I. -Iinclude -Ibindings/cxx/include -fPIC -o $@ -c $<
+	$(AM_V_CXX)$(CXX) $(RBSIGROK_CFLAGS) -I. -Iinclude -Ibindings/cxx/include $(local_includes) -fPIC -o $@ -c $<
 
 $(REXT): $(ROBJ) @ORDER@ bindings/cxx/libsigrokcxx.la
 	$(AM_V_CXXLD)$(CXX) -shared -std=c++11 -o $@ $< -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS)
@@ -713,7 +714,7 @@ ruby-install: $(REXT)
 
 ruby-clean:
 	-$(AM_V_at)rm -fr $(RDIR)/doc
-	-$(AM_V_at)rm $(REXT) $(ROBJ) $(RWRAP) $(RDOC)
+	-$(AM_V_at)rm -f $(REXT) $(ROBJ) $(RWRAP) $(RDOC)
 
 ruby-doc: $(RWRAP)
 	$(AM_V_at)yard doc -o $(RDIR)/doc $<