diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 02:23:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 02:23:26 +0000 |
| commit | e2e973ceeb62d5ecf87e45128bbe985d27227fda (patch) | |
| tree | 288cbc4b1403f7a4d9b891329e830a2a6871fa57 /enc/Makefile.in | |
| parent | f0413dc9f14319d504b012776483942808e281a9 (diff) | |
| download | ruby-e2e973ceeb62d5ecf87e45128bbe985d27227fda.tar.gz ruby-e2e973ceeb62d5ecf87e45128bbe985d27227fda.tar.xz ruby-e2e973ceeb62d5ecf87e45128bbe985d27227fda.zip | |
* common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.
* encoding.c (Init_Encoding): ISO-8859-1 is no longer a replica.
* regenc.h (OnigEncodingDefine): names of extension and encoding can
differ.
* enc/Makefile.in: always shared.
* enc/depend (deffile): should not upcase.
* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: fix for Init.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc/Makefile.in')
| -rw-r--r-- | enc/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index a16124dc2..21be8ae02 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -16,14 +16,14 @@ BUILTIN_ENCS = ascii.c \ RUBY_SO_NAME = @RUBY_SO_NAME@ LIBRUBY = @LIBRUBY@ -LIBRUBY_A = @LIBRUBY_A@ -LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@ +LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED) empty = CC = @CC@ OUTFLAG = @OUTFLAG@$(empty) -CFLAGS = @CFLAGS@ @ARCH_FLAG@ +CFLAGS = $(CCDLFLAGS) @CFLAGS@ @ARCH_FLAG@ +CCDLFLAGS = @CCDLFLAGS@ INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir) DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register |