From 68adb6193a39476cd91d5d9da8ca6aaf63e5ca1b Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 15 Jan 2008 08:53:07 +0000 Subject: [PATCH] * enc/Makefile.in: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- enc/Makefile.in | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73a7a9cd49..2cb4c1b2c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ -Tue Jan 15 17:26:51 2008 Nobuyoshi Nakada +Tue Jan 15 17:53:05 2008 Nobuyoshi Nakada * enc/utf_8.c: renamed as IANA name. + * enc/Makefile.in: ditto. + Tue Jan 15 16:59:31 2008 Nobuyoshi Nakada * ruby.c (proc_options): encoding libraries cannot be loaded until diff --git a/enc/Makefile.in b/enc/Makefile.in index a1f9142a16..cafeff964a 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -15,7 +15,7 @@ DLEXT = @DLEXT@ OBJEXT = @OBJEXT@ BUILTIN_ENCS = ascii.c us_ascii.c\ - unicode.c utf8.c + unicode.c utf_8.c RUBY_SO_NAME = @RUBY_SO_NAME@ LIBRUBY = @LIBRUBY@ @@ -34,7 +34,7 @@ CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register LDFLAGS = @LDFLAGS@ LIBS = @LIBRUBYARG@ @LIBS@ $(EXTLIBS) LDSHARED = @LDSHARED@ -ldflags = $(CFLAGS) $(LDFLAGS) +ldflags = $(LDFLAGS) dldflags = @DLDFLAGS@ archflag = @ARCH_FLAG@ DLDFLAGS = $(ldflags) $(dldflags) $(archflag)