diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-17 08:17:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-17 08:17:50 +0000 |
| commit | 4cf13ffaef0a53311254fb74b2688c675969fc4e (patch) | |
| tree | dc72e7d23acf27292353f52d2c996822b4cd4130 /enc | |
| parent | 33ecb05d5118ec54f4b6efdd53d8f5b2f666ead8 (diff) | |
* configure.in (EXTERNAL_ENCOBJS, ENCSOS): removed.
* enc/Makefile.in (BUILTIN_ENCS): includes .c suffix.
* enc/depend: splitted from Makefile.in.
* {bcc32,win32,wince}/setup.mak (-encs-): extracts BUILTIN_ENCOBJS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/Makefile.in | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index 86ed944262..9f9473adde 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -1,7 +1,7 @@ srcdir = @srcdir@ top_srcdir = $(srcdir:/enc=) arch = @arch@ -EXTOUT = $(top_srcdir)/@EXTOUT@ +EXTOUT = @EXTOUT@ hdrdir = $(top_srcdir)/include arch_hdrdir = $(EXTOUT)/include/$(arch) VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(top_srcdir):$(srcdir) @@ -9,9 +9,9 @@ ENCSODIR = $(EXTOUT)/$(arch)/enc DLEXT = @DLEXT@ OBJEXT = @OBJEXT@ -BUILTIN_ENCS = ascii \ - euc_jp sjis \ - unicode utf8 +BUILTIN_ENCS = ascii.c \ + euc_jp.c sjis.c \ + unicode.c utf8.c ENCOBJS = @EXTERNAL_ENCOBJS@ ENCSOS = @ENCSOS@ @@ -26,8 +26,3 @@ XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS) LIBS = @LIBS@ $(EXTLIBS) LDSHARED = @LDSHARED@ DLDFLAGS = @DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@ - -all: $(ENCOBJS) $(ENCSOS) - -.c.@OBJEXT@: - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c $< |