From dc4d4b3923cbb832f69abdc0df6d9ee0ea38cae1 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 20 Dec 2007 08:07:56 +0000 Subject: * common.mk (enc.mk): depends on rbconfig.rb. * regenc.h (OnigEncodingDefine): external encoding definition macro. * enc/Makefile.in: fix for linking. * enc/depend, enc/make_encmake.rb: fix for Windows. * enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: renamed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/make_encmake.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'enc/make_encmake.rb') diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index c20920168c..799c4a0851 100644 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -14,11 +14,13 @@ 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")) tmp = '' - eval(serb(File.read(depend), 'tmp')) + eval(serb(File.read(depend), 'tmp'), binding, depend) mkin << "\n#### depend ####\n\n" << depend_rules(tmp).join end open(ARGV[0], 'wb') {|f| -- cgit v1.2.3