From dbcd88ecfbeea1b3b4a7bc1570d81a64c97ef67d Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 24 Aug 2008 15:58:43 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@18826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index ec29affcc..c8d243ce0 100644 --- a/common.mk +++ b/common.mk @@ -81,6 +81,7 @@ COMMONOBJS = array.$(OBJEXT) \ thread.$(OBJEXT) \ cont.$(OBJEXT) \ $(BUILTIN_ENCOBJS) \ + $(BUILTIN_TRANSOBJS) \ $(MISSING) OBJS = dln.$(OBJEXT) \ @@ -381,7 +382,7 @@ encs: enc.mk $(LIBRUBY) $(PREP) transdb.h enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ $(srcdir)/lib/mkmf.rb $(RBCONFIG) - $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@ $(ENCS) + $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS) .PRECIOUS: $(MKFILES) @@ -661,6 +662,10 @@ unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regint.h \ utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \ {$(VPATH)}defines.h {$(VPATH)}oniguruma.h +newline.c: $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb +newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h {$(VPATH)}intern.h \ + {$(VPATH)}missing.h {$(VPATH)}st.h {$(VPATH)}transcode_data.h + INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ vmtc.inc vm.inc @@ -686,7 +691,7 @@ vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl vm.inc: $(srcdir)/template/vm.inc.tmpl -srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c srcs-enc +srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c $(srcdir)/ext/ripper/ripper.c srcs-enc srcs-enc: enc.mk $(MAKE) -f enc.mk RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs @@ -715,6 +720,9 @@ prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(PRELUDE_SCRIPTS) $(PR golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@ +newline.c: + $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans + prereq: incs srcs preludes preludes: {$(VPATH)}miniprelude.c -- cgit