diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-08 07:44:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-08 07:44:42 +0000 |
| commit | 5c170f2a35bd58b457ce074c6c612f599622817c (patch) | |
| tree | 5868a127ef8eeefdf89e8764a31b496e568a3bc7 | |
| parent | 41166acaf57c106698ad01dcb8ee939d620ee621 (diff) | |
| download | ruby-5c170f2a35bd58b457ce074c6c612f599622817c.tar.gz ruby-5c170f2a35bd58b457ce074c6c612f599622817c.tar.xz ruby-5c170f2a35bd58b457ce074c6c612f599622817c.zip | |
* common.mk (srcs-enc): renamed from transcodes.
* enc/Makefile.in (make-workdir): creates object directories.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | common.mk | 8 | ||||
| -rw-r--r-- | enc/Makefile.in | 7 |
3 files changed, 14 insertions, 7 deletions
@@ -1,4 +1,8 @@ -Fri Aug 8 16:15:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Aug 8 16:44:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (srcs-enc): renamed from transcodes. + + * enc/Makefile.in (make-workdir): creates object directories. * common.mk (encdb.h): see both $(srcdir)/enc and enc. @@ -377,7 +377,6 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) -so_name=$(RUBY_SO_NAME) rbconfig.rb encs: enc.mk $(LIBRUBY) $(PREP) - $(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc" enc $(MAKE) -f enc.mk RUBY="$(MINIRUBY)" $(MFLAGS) enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ @@ -666,10 +665,9 @@ 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 transcodes +srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c srcs-enc -transcodes: enc.mk - $(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans +srcs-enc: enc.mk $(MAKE) -f enc.mk RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h $(srcdir)/revision.h @@ -683,7 +681,7 @@ encdb.h: $(PREP) $(MINIRUBY) $(srcdir)/enc/make_encdb.rb $@.new $(srcdir)/enc enc $(IFCHANGE) "$@" "$@.new" -transdb.h: $(PREP) transcodes +transdb.h: $(PREP) srcs-enc $(MINIRUBY) $(srcdir)/enc/trans/make_transdb.rb $@.new $(srcdir)/enc/trans enc/trans $(IFCHANGE) "$@" "$@.new" diff --git a/enc/Makefile.in b/enc/Makefile.in index be2b51858..103ad6b9a 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -43,11 +43,16 @@ dldflags = @DLDFLAGS@ archflag = @ARCH_FLAG@ DLDFLAGS = $(ldflags) $(dldflags) $(archflag) +WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans + RM = @RM@ .SUFFIXES: .erb.c -all: +all srcs: make-workdir + +make-workdir: + $(MINIRUBY) -run -e mkdir -- -p $(WORKDIRS) clean: |