From 1d42889c4eac6cdaee6f5b6c7beb6510efe7368d Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 8 Apr 2013 14:09:42 +0000 Subject: [PATCH] ext/depend: fix dependency * 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 --- ChangeLog | 6 ++++++ enc/depend | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 844aa2245e..89f7755774 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 8 23:09:34 2013 Nobuyoshi Nakada + + * 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 * ext/depend (ENCOBJS, TRANSOBJS): Add missing dependencies. diff --git a/enc/depend b/enc/depend index e2291291e5..99b50b019a 100644 --- a/enc/depend +++ b/enc/depend @@ -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"