diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-20 08:07:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-20 08:07:56 +0000 |
| commit | dc4d4b3923cbb832f69abdc0df6d9ee0ea38cae1 (patch) | |
| tree | fcfaf15c7c5843954940f34a66abee4e68901b89 /enc/Makefile.in | |
| parent | be137f3601610491d4265a4f9c87bf52fef28d66 (diff) | |
| download | ruby-dc4d4b3923cbb832f69abdc0df6d9ee0ea38cae1.tar.gz | |
* 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
Diffstat (limited to 'enc/Makefile.in')
| -rw-r--r-- | enc/Makefile.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index 6cb9789976..a16124dc24 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -1,4 +1,6 @@ srcdir = @srcdir@ +topdir = . +libdir = @libdir@ top_srcdir = $(srcdir:/enc=) arch = @arch@ EXTOUT = @EXTOUT@ @@ -12,16 +14,22 @@ BUILTIN_ENCS = ascii.c \ euc_jp.c sjis.c \ unicode.c utf8.c +RUBY_SO_NAME = @RUBY_SO_NAME@ +LIBRUBY = @LIBRUBY@ +LIBRUBY_A = @LIBRUBY_A@ +LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@ +LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@ + empty = CC = @CC@ OUTFLAG = @OUTFLAG@$(empty) CFLAGS = @CFLAGS@ @ARCH_FLAG@ INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir) DEFS = @DEFS@ -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS) -LIBS = @LIBS@ $(EXTLIBS) +LIBS = @LIBRUBYARG@ @LIBS@ $(EXTLIBS) LDSHARED = @LDSHARED@ DLDFLAGS = @DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@ |