diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 15:58:43 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 15:58:43 +0000 |
| commit | 2c78899641c9f34377b67f3df32662232db801e9 (patch) | |
| tree | 25b9147fc384af9d928191ad679b58ab5f986470 /enc | |
| parent | 2a9369fcbaf7fe52b863827cef7c7533099f5f61 (diff) | |
* configure.in (BUILTIN_TRANSSRCS): defined.
(BUILTIN_TRANSOBJS): defined.
* enc/Makefile.in (BUILTIN_TRANSES): defined.
* enc/make_encmake.rb (BUILTIN_TRANSES): defined.
* enc/depend: don't generate rules for builtin transcoders.
* common.mk (COMMONOBJS): add BUILTIN_TRANSOBJS.
(enc.mk): pass BUILTIN_TRANSOBJS.
(newline.c): new rule.
(newline.$(OBJEXT)): new ru.e
(srcs): newline.c added.
* Makefile.in (BUILTIN_TRANSSRCS): defined.
(BUILTIN_TRANSOBJS): defined.
* transcode.c (Init_transcode): call Init_newline.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/Makefile.in | 2 | ||||
| -rw-r--r-- | enc/depend | 2 | ||||
| -rw-r--r-- | enc/make_encmake.rb | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index 460ec320df..b7762191c4 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -17,6 +17,8 @@ OBJEXT = @OBJEXT@ BUILTIN_ENCS = ascii.c us_ascii.c\ unicode.c utf_8.c +BUILTIN_TRANSES = newline.trans + RUBY_SO_NAME = @RUBY_SO_NAME@ LIBRUBY = @LIBRUBY@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@ diff --git a/enc/depend b/enc/depend index fd4423ebc3..2e448d3b1a 100644 --- a/enc/depend +++ b/enc/depend @@ -17,6 +17,8 @@ % end % } % } +% trans -= BUILTIN_TRANSES +% atrans -= BUILTIN_TRANSES % trans.uniq! % atrans = atrans.sort_by(&alphanumeric_order) % trans = trans.sort_by(&alphanumeric_order) diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index f8c7735047..107a387571 100644 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -12,6 +12,7 @@ require 'erb' CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p' BUILTIN_ENCS = [] +BUILTIN_TRANSES = [] ENC_PATTERNS = [] NOENC_PATTERNS = [] @@ -20,6 +21,9 @@ until ARGV.empty? when /\A--builtin-encs=/ BUILTIN_ENCS.concat $'.split.map {|e| File.basename(e, '.*') << '.c'} ARGV.shift + when /\A--builtin-transes=/ + BUILTIN_TRANSES.concat $'.split.map {|e| File.basename(e, '.*') } + ARGV.shift when /\A--encs=/ ENC_PATTERNS.concat $'.split ARGV.shift |