From a436540271ab1faaeea1644c381bae1bb153d33b Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 8 Apr 2013 14:56:01 +0000 Subject: [PATCH] ext/depend: fix dependency for nmake * ext/depend (ENCOBJS, TRANSOBJS): use explicit path to ruby.h for nmake. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- enc/depend | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89f7755774..0c1a6aca8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Mon Apr 8 23:09:34 2013 Nobuyoshi Nakada +Mon Apr 8 23:55:53 2013 Nobuyoshi Nakada + + * ext/depend (ENCOBJS, TRANSOBJS): use explicit path to ruby.h for + nmake. * ext/depend (ENCOBJS, TRANSOBJS): fix header dependency, VPATH has $(srcdir)/include/ruby but not $(srcdir)/include, so cannot find out diff --git a/enc/depend b/enc/depend index 99b50b019a..5750a0dc49 100644 --- a/enc/depend +++ b/enc/depend @@ -83,13 +83,13 @@ srcs: $(TRANSCSRCS) % unless ENCS.empty? or TRANS.empty? % unless ENCS.empty? -$(ENCOBJS): ../ruby.h regenc.h oniguruma.h config.h defines.h ruby.h missing.h subst.h intern.h st.h encoding.h +$(ENCOBJS): $(hdrdir)/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.h ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h subst.h encoding.h +$(TRANSOBJS): $(hdrdir)/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"