Skip to content

Commit

Permalink
ext/depend: fix dependency
Browse files Browse the repository at this point in the history
* ext/depend (ENCOBJS, TRANSOBJS): fix header dependency, VPATH has
  $(srcdir)/include/ruby but not $(srcdir)/include, so cannot find out
  ruby/ruby.h.  use ruby.h instead and ../ruby for include/ruby.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Apr 8, 2013
1 parent 4fe5900 commit 1d42889
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Mon Apr 8 23:09:34 2013 Nobuyoshi Nakada <[email protected]>

* ext/depend (ENCOBJS, TRANSOBJS): fix header dependency, VPATH has
$(srcdir)/include/ruby but not $(srcdir)/include, so cannot find out
ruby/ruby.h. use ruby.h instead and ../ruby for include/ruby.h.

Mon Apr 8 20:30:37 2013 Yuki Yugui Sonoda <[email protected]>

* ext/depend (ENCOBJS, TRANSOBJS): Add missing dependencies.
Expand Down
4 changes: 2 additions & 2 deletions enc/depend
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ srcs: $(TRANSCSRCS)
% unless ENCS.empty? or TRANS.empty?

% unless ENCS.empty?
$(ENCOBJS): regenc.h oniguruma.h config.h defines.h ruby/ruby.h missing.h subst.h intern.h st.h encoding.h
$(ENCOBJS): ../ruby.h regenc.h oniguruma.h config.h defines.h ruby.h missing.h subst.h intern.h st.h encoding.h
% end
% ENC_DEPS.each do |e, deps|
enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
% end
% unless TRANS.empty?
$(TRANSOBJS): ruby/ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h subst.h encoding.h
$(TRANSOBJS): ../ruby.h ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h subst.h encoding.h
% end
% ATRANS.each do |e|
% src = "#{e}.trans"
Expand Down

0 comments on commit 1d42889

Please sign in to comment.