From 8d292a08dfb79ec9a55673eb570f1c5128cc47ec Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 24 Dec 2007 03:49:56 +0000 Subject: * Makefile.in, configure.in, lib/mkmf.rb, */Makefile.sub: specify compiled output file name explicitly. * enc/Makefile.in, enc/depend: now makes compiler to put generated files under directories corresnponding to the each source. enc/trans supported. * enc/make_encmake.rb: evaluates depend file before Makefile.in so that the former can influence to CONFIG. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/make_encmake.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'enc/make_encmake.rb') diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index 7b03149854..d491b28d6e 100644 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -14,16 +14,16 @@ else BUILTIN_ENCS = [] end -DEFFILE = (true if CONFIG["DLDFLAGS"].sub!(/\s+-def:\$\(DEFFILE\)\s+/, ' ')) - -mkin = File.read(File.join($srcdir, "Makefile.in")) -mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]} if File.exist?(depend = File.join($srcdir, "depend")) erb = ERB.new(File.read(depend), nil, '%') erb.filename = depend tmp = erb.result(binding) - mkin << "\n#### depend ####\n\n" << depend_rules(tmp).join + dep = "\n#### depend ####\n\n" << depend_rules(tmp).join +else + dep = "" end +mkin = File.read(File.join($srcdir, "Makefile.in")) +mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]} open(ARGV[0], 'wb') {|f| - f.puts mkin + f.puts mkin, dep } -- cgit v1.2.3