]> sigrok.org Git - libsigrok.git/commitdiff
Build: avoid $< in ruby bindings rules
authorAurelien Jacobs <redacted>
Wed, 25 May 2016 20:38:41 +0000 (22:38 +0200)
committerUwe Hermann <redacted>
Mon, 30 May 2016 09:45:40 +0000 (11:45 +0200)
This fixes building with BSD make.
This closes bug #801.

Makefile.am

index 7f61c19b2b17e126e0e2b4ccdfa4e7a88d1b597c..58842e9bfad8c25dd79dc66820e9023fcdf04824 100644 (file)
@@ -704,26 +704,26 @@ $(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) \
+$(RWRAP): $(srcdir)/$(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 -I$(RDIR) $(local_includes) $(swig_defs) -o $@ $<
+       $(AM_V_GEN)$(SWIG) -ruby -c++ -Ibindings -Ibindings/cxx/include -I$(RDIR) $(local_includes) $(swig_defs) -o $@ $(srcdir)/$(RDIR)/classes.i
 
 $(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 $(local_includes) -fPIC -o $@ -c $<
+       $(AM_V_CXX)$(CXX) $(RBSIGROK_CFLAGS) -I. -Iinclude -Ibindings/cxx/include $(local_includes) -fPIC -o $@ -c $(RWRAP)
 
 $(REXT): $(ROBJ) @ORDER@ bindings/cxx/libsigrokcxx.la
-       $(AM_V_CXXLD)$(CXX) -shared -o $@ $< -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS)
+       $(AM_V_CXXLD)$(CXX) -shared -o $@ $(ROBJ) -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS)
 
 ruby-build: $(REXT)
 
 ruby-install: $(REXT)
        $(INSTALL) -d $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
-       $(INSTALL) $< $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
+       $(INSTALL) $(REXT) $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
 
 ruby-uninstall:
        rm -f $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)/sigrok.$(RUBY_DLEXT)
@@ -733,7 +733,7 @@ ruby-clean:
        -$(AM_V_at)rm -f $(REXT) $(ROBJ) $(RWRAP) $(RDOC)
 
 ruby-doc: $(RWRAP)
-       $(AM_V_at)yard doc -o $(RDIR)/doc $<
+       $(AM_V_at)yard doc -o $(RDIR)/doc $(RWRAP)
 
 BUILD_EXTRA += ruby-build
 INSTALL_EXTRA += ruby-install