From fbbf3afc1165c351666828a237958d69433fde9c Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 18 Jan 2015 03:56:52 +0000 Subject: builtin encodings and transcoder locations * Makefile.in (VPATH, NEWLINE_C), common.mk (common-srcs): make and use newline.c under enc/trans directory, not toplevel. no longer search enc directory implicitly. * configure.in, enc/Makefile.in (BUILTIN_ENCS, BUILTIN_TRANSES): prefix respective directory names to builtin encodings and transcoder source names. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile.sub | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'win32') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 668f9e151d..9165b4d359 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -370,7 +370,7 @@ EXTOBJS = dmyext.$(OBJEXT) arch_hdrdir = $(EXTOUT)/include/$(arch) top_srcdir = $(srcdir) hdrdir = $(srcdir)/include -VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(win_srcdir) +VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/missing;$(win_srcdir) !if exist($(srcdir)/.svn) VCS = svn @@ -398,10 +398,10 @@ ruby: $(PROGRAM) rubyw: $(WPROGRAM) stub: $(STUBPROGRAM) -!if !exist(newline.c) && exist($(srcdir)/newline.c) -NEWLINE_C = $(srcdir)/newline.c +!if !exist(enc/trans/newline.c) && exist($(srcdir)/enc/trans/newline.c) +NEWLINE_C = $(srcdir)/enc/trans/newline.c !else -NEWLINE_C = newline.c +NEWLINE_C = enc/trans/newline.c !endif !if !exist(miniprelude.c) && exist($(srcdir)/miniprelude.c) MINIPRELUDE_C = $(srcdir)/miniprelude.c @@ -1072,6 +1072,9 @@ $(ruby_pc): $(RBCONFIG) @$(MINIRUBY) -r./rbconfig $(srcdir)/tool/expand-config.rb \ $(srcdir)/template/ruby.pc.in > $@ +{$(srcdir)/enc/trans}.c.obj: + $(ECHO) compiling $(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(srcdir)/enc}.c.obj: $(ECHO) compiling $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) -- cgit v1.2.3