diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-17 08:47:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-17 08:47:28 +0000 |
| commit | b2d9f1e9d0da3a0b63e231d5692824368efd80cd (patch) | |
| tree | 44bd02ed0131bb0b8754c9ff3279d0cc3195d43a /enc | |
| parent | 5043ab95ed0fdbdc20a918d8b7b809dbc41bcba1 (diff) | |
* common.mk (encs): new target to compile external encodings.
* enc/Makefile.in: became a serb template.
* enc/make_encmake.rb: creates enc.mk from enc/Makefile.in using serb.
* lib/mkmf.rb (relative_from): moved from ext/extmk.rb.
* lib/mkmf.rb ($extmk): true if under to top source directory, not
only ext.
* lib/mkmf.rb (depend_rules): extracted from create_makefile.
* tool/serb.rb (serb): splitted from tool/compile_prelude.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/Makefile.in | 20 | ||||
| -rw-r--r-- | enc/make_encmake.rb | 23 |
2 files changed, 40 insertions, 3 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index 9f9473adde..05296dc602 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -4,7 +4,7 @@ arch = @arch@ EXTOUT = @EXTOUT@ hdrdir = $(top_srcdir)/include arch_hdrdir = $(EXTOUT)/include/$(arch) -VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(top_srcdir):$(srcdir) +VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join("@PATH_SEPARATOR@") %> ENCSODIR = $(EXTOUT)/$(arch)/enc DLEXT = @DLEXT@ OBJEXT = @OBJEXT@ @@ -13,8 +13,8 @@ BUILTIN_ENCS = ascii.c \ euc_jp.c sjis.c \ unicode.c utf8.c -ENCOBJS = @EXTERNAL_ENCOBJS@ -ENCSOS = @ENCSOS@ +ENCOBJS = <%encs.map {|e|"#{e}.$(OBJEXT)"}.join(" \\\n\t ")+"\n"%> +ENCSOS = <%encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")+"\n"%> empty = CC = @CC@ OUTFLAG = @OUTFLAG@$(empty) @@ -26,3 +26,17 @@ XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS) LIBS = @LIBS@ $(EXTLIBS) LDSHARED = @LDSHARED@ DLDFLAGS = @DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@ + +#!#! if File.exist?(depend = File.join($srcdir, "depend")) +#### depend #### +#!#<% depend_rules(depend).join%> +#!#! end +#!#! encs.each do |e| +#!# +#!#$(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT) +#!# <%LINK_SO.gsub(/\n/, "\n\t")%> +#!#! end +#!#! encs.each do |e| +#!# +#!#<%e%>.$(OBJEXT): <% (RULE_SUBST || "%s") % "#{e}.c" %> +#!#! end diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb new file mode 100644 index 0000000000..fe75b2778d --- /dev/null +++ b/enc/make_encmake.rb @@ -0,0 +1,23 @@ +#! ./miniruby + +dir = File.expand_path("../..", __FILE__) +$:.unshift(File.join(dir, "lib")) +$:.unshift(dir) +File.directory?("enc") || File.mkdir("enc") +$:.unshift(".") +require 'mkmf' +require 'tool/serb' + +encdir = File.join($top_srcdir, "enc") + +encs = Dir.open(encdir) {|d| d.grep(/.+\.c\z/)} +encs -= CONFIG["BUILTIN_ENCS"].split +encs.each {|e| e.chomp!(".c")} +mkin = File.read(File.join(encdir, "Makefile.in")) +mkin.gsub!(/^\#!\# ?/, '') +mkin.gsub!(/@(#{RbConfig::MAKEFILE_CONFIG.keys.join('|')})@/) {CONFIG[$1]} +tmp = '' +eval(serb(mkin, 'tmp')) +open(ARGV[0], 'w') {|f| + f.puts tmp +} |