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

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

This closes bug #797.
This commit is contained in:
Aurelien Jacobs 2016-05-12 23:08:21 +02:00
parent 45884333ff
commit 17165513f3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -688,19 +688,20 @@ ROBJ = $(RWRAP:.cpp=.o)
REXT = $(RDIR)/sigrok.$(RUBY_DLEXT) REXT = $(RDIR)/sigrok.$(RUBY_DLEXT)
$(RDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC) $(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) > $@ $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py ruby $(CPPXMLDOC) > $@
$(RWRAP): $(RDIR)/classes.i $(RDOC) \ $(RWRAP): $(RDIR)/classes.i $(RDOC) \
bindings/swig/classes.i bindings/swig/templates.i \ bindings/swig/classes.i bindings/swig/templates.i \
bindings/swig/enums.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) \ $(ROBJ): $(RWRAP) \
$(library_include_HEADERS) \ $(library_include_HEADERS) \
$(nodist_library_include_HEADERS) \ $(nodist_library_include_HEADERS) \
$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
$(nodist_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 $(REXT): $(ROBJ) @ORDER@ bindings/cxx/libsigrokcxx.la
$(AM_V_CXXLD)$(CXX) -shared -std=c++11 -o $@ $< -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS) $(AM_V_CXXLD)$(CXX) -shared -std=c++11 -o $@ $< -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS)
@ -713,7 +714,7 @@ ruby-install: $(REXT)
ruby-clean: ruby-clean:
-$(AM_V_at)rm -fr $(RDIR)/doc -$(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) ruby-doc: $(RWRAP)
$(AM_V_at)yard doc -o $(RDIR)/doc $< $(AM_V_at)yard doc -o $(RDIR)/doc $<