1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefer relative directory from srcdir to top_srcdir

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-02-14 05:42:14 +00:00
parent 4fc656a2f3
commit d1e6304a89
8 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/digest/bubblebabble/depend
View File

@ -9,6 +9,6 @@ bubblebabble.o: $(hdrdir)/ruby/missing.h
bubblebabble.o: $(hdrdir)/ruby/ruby.h bubblebabble.o: $(hdrdir)/ruby/ruby.h
bubblebabble.o: $(hdrdir)/ruby/st.h bubblebabble.o: $(hdrdir)/ruby/st.h
bubblebabble.o: $(hdrdir)/ruby/subst.h bubblebabble.o: $(hdrdir)/ruby/subst.h
bubblebabble.o: $(top_srcdir)/ext/digest/digest.h bubblebabble.o: $(srcdir)/../digest.h
bubblebabble.o: bubblebabble.c bubblebabble.o: bubblebabble.c
# AUTOGENERATED DEPENDENCIES END # AUTOGENERATED DEPENDENCIES END

2
ext/digest/md5/depend
View File

@ -12,7 +12,7 @@ md5init.o: $(hdrdir)/ruby/missing.h
md5init.o: $(hdrdir)/ruby/ruby.h md5init.o: $(hdrdir)/ruby/ruby.h
md5init.o: $(hdrdir)/ruby/st.h md5init.o: $(hdrdir)/ruby/st.h
md5init.o: $(hdrdir)/ruby/subst.h md5init.o: $(hdrdir)/ruby/subst.h
md5init.o: $(top_srcdir)/ext/digest/digest.h md5init.o: $(srcdir)/../digest.h
md5init.o: md5init.c md5init.o: md5init.c
md5init.o: md5ossl.h md5init.o: md5ossl.h
# AUTOGENERATED DEPENDENCIES END # AUTOGENERATED DEPENDENCIES END

2
ext/digest/rmd160/depend
View File

@ -12,7 +12,7 @@ rmd160init.o: $(hdrdir)/ruby/missing.h
rmd160init.o: $(hdrdir)/ruby/ruby.h rmd160init.o: $(hdrdir)/ruby/ruby.h
rmd160init.o: $(hdrdir)/ruby/st.h rmd160init.o: $(hdrdir)/ruby/st.h
rmd160init.o: $(hdrdir)/ruby/subst.h rmd160init.o: $(hdrdir)/ruby/subst.h
rmd160init.o: $(top_srcdir)/ext/digest/digest.h rmd160init.o: $(srcdir)/../digest.h
rmd160init.o: rmd160init.c rmd160init.o: rmd160init.c
rmd160init.o: rmd160ossl.h rmd160init.o: rmd160ossl.h
# AUTOGENERATED DEPENDENCIES END # AUTOGENERATED DEPENDENCIES END

2
ext/digest/sha1/depend
View File

@ -12,7 +12,7 @@ sha1init.o: $(hdrdir)/ruby/missing.h
sha1init.o: $(hdrdir)/ruby/ruby.h sha1init.o: $(hdrdir)/ruby/ruby.h
sha1init.o: $(hdrdir)/ruby/st.h sha1init.o: $(hdrdir)/ruby/st.h
sha1init.o: $(hdrdir)/ruby/subst.h sha1init.o: $(hdrdir)/ruby/subst.h
sha1init.o: $(top_srcdir)/ext/digest/digest.h sha1init.o: $(srcdir)/../digest.h
sha1init.o: sha1init.c sha1init.o: sha1init.c
sha1init.o: sha1ossl.h sha1init.o: sha1ossl.h
# AUTOGENERATED DEPENDENCIES END # AUTOGENERATED DEPENDENCIES END

2
ext/digest/sha2/depend
View File

@ -12,7 +12,7 @@ sha2init.o: $(hdrdir)/ruby/missing.h
sha2init.o: $(hdrdir)/ruby/ruby.h sha2init.o: $(hdrdir)/ruby/ruby.h
sha2init.o: $(hdrdir)/ruby/st.h sha2init.o: $(hdrdir)/ruby/st.h
sha2init.o: $(hdrdir)/ruby/subst.h sha2init.o: $(hdrdir)/ruby/subst.h
sha2init.o: $(top_srcdir)/ext/digest/digest.h sha2init.o: $(srcdir)/../digest.h
sha2init.o: sha2init.c sha2init.o: sha2init.c
sha2init.o: sha2ossl.h sha2init.o: sha2ossl.h
# AUTOGENERATED DEPENDENCIES END # AUTOGENERATED DEPENDENCIES END

2
ext/json/generator/depend
View File

@ -17,7 +17,7 @@ generator.o: $(hdrdir)/ruby/regex.h
generator.o: $(hdrdir)/ruby/ruby.h generator.o: $(hdrdir)/ruby/ruby.h
generator.o: $(hdrdir)/ruby/st.h generator.o: $(hdrdir)/ruby/st.h
generator.o: $(hdrdir)/ruby/subst.h generator.o: $(hdrdir)/ruby/subst.h
generator.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h generator.o: $(srcdir)/../fbuffer/fbuffer.h
generator.o: generator.c generator.o: generator.c
generator.o: generator.h generator.o: generator.h
# AUTOGENERATED DEPENDENCIES END # AUTOGENERATED DEPENDENCIES END

2
ext/json/parser/depend
View File

@ -15,7 +15,7 @@ parser.o: $(hdrdir)/ruby/oniguruma.h
parser.o: $(hdrdir)/ruby/ruby.h parser.o: $(hdrdir)/ruby/ruby.h
parser.o: $(hdrdir)/ruby/st.h parser.o: $(hdrdir)/ruby/st.h
parser.o: $(hdrdir)/ruby/subst.h parser.o: $(hdrdir)/ruby/subst.h
parser.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h parser.o: $(srcdir)/../fbuffer/fbuffer.h
parser.o: parser.c parser.o: parser.c
parser.o: parser.h parser.o: parser.h
parser.o: parser.rl parser.o: parser.rl

10
tool/update-deps
View File

@ -211,8 +211,9 @@ def in_makefile(target, source)
end end
["enc/depend", target2, source2] ["enc/depend", target2, source2]
when %r{\Aext/} when %r{\Aext/}
unless File.exist?("#{File.dirname(target)}/extconf.rb") targetdir = File.dirname(target)
warn "warning: not found: #{File.dirname(target)}/extconf.rb" unless File.exist?("#{targetdir}/extconf.rb")
warn "warning: not found: #{targetdir}/extconf.rb"
end end
target2 = File.basename(target) target2 = File.basename(target)
relpath = Pathname(source).relative_path_from(Pathname(target).dirname).to_s relpath = Pathname(source).relative_path_from(Pathname(target).dirname).to_s
@ -224,8 +225,9 @@ def in_makefile(target, source)
when *FILES_SAME_NAME_TOP then source2 = "$(top_srcdir)/#{source}" when *FILES_SAME_NAME_TOP then source2 = "$(top_srcdir)/#{source}"
when %r{\A\.ext/include/[^/]+/ruby/} then source2 = "$(arch_hdrdir)/ruby/#{$'}" when %r{\A\.ext/include/[^/]+/ruby/} then source2 = "$(arch_hdrdir)/ruby/#{$'}"
when %r{\Ainclude/} then source2 = "$(hdrdir)/#{$'}" when %r{\Ainclude/} then source2 = "$(hdrdir)/#{$'}"
when %r{\A#{Regexp.escape File.dirname(target)}/extconf\.h\z} then source2 = "$(RUBY_EXTCONF_H)" when %r{\A#{Regexp.escape targetdir}/extconf\.h\z} then source2 = "$(RUBY_EXTCONF_H)"
when %r{\A#{Regexp.escape File.dirname(target)}/} then source2 = $' when %r{\A#{Regexp.escape targetdir}/} then source2 = $'
when %r{\A#{Regexp.escape File.dirname(targetdir)}/} then source2 = "$(srcdir)/../#{$'}"
else source2 = "$(top_srcdir)/#{source}" else source2 = "$(top_srcdir)/#{source}"
end end
["#{File.dirname(target)}/depend", target2, source2] ["#{File.dirname(target)}/depend", target2, source2]