nobu	2014-11-28 05:02:32 +0900 (Fri, 28 Nov 2014)

  New Revision: 48623

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48623

  Log:
    dmyenc.c: separate
    
    * dmyenc.c (Init_enc): separate from dmyext.c for statically
      linked extension excluding encoding libraries.

  Added files:
    trunk/dmyenc.c
  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/configure.in
    trunk/dmyext.c
    trunk/win32/Makefile.sub
Index: configure.in
===================================================================
--- configure.in	(revision 48622)
+++ configure.in	(revision 48623)
@@ -3240,6 +3240,9 @@ AS_CASE([",$EXTSTATIC,"], [,static,|*,en https://github.com/ruby/ruby/blob/trunk/configure.in#L3240
   EXTOBJS='ext/extinit.$(OBJEXT)'
   AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
   AC_SUBST(ENCSTATIC, static)
+], [
+  ENCOBJS='dmyenc.$(OBJEXT)'
+  EXTOBJS='dmyext.$(OBJEXT)'
 ])
 AC_SUBST(ENCOBJS)
 AC_SUBST(EXTOBJS)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48622)
+++ ChangeLog	(revision 48623)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Nov 28 05:02:29 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* dmyenc.c (Init_enc): separate from dmyext.c for statically
+	  linked extension excluding encoding libraries.
+
 Thu Nov 27 21:58:30 2014  Tanaka Akira  <akr@f...>
 
 	* common.mk (miniprelude.c): It does not depend on prelude.rb now.
Index: dmyenc.c
===================================================================
--- dmyenc.c	(revision 0)
+++ dmyenc.c	(revision 48623)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/dmyenc.c#L1
+void
+Init_enc(void)
+{
+}

Property changes on: dmyenc.c
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: dmyext.c
===================================================================
--- dmyext.c	(revision 48622)
+++ dmyext.c	(revision 48623)
@@ -2,8 +2,3 @@ void https://github.com/ruby/ruby/blob/trunk/dmyext.c#L2
 Init_ext(void)
 {
 }
-
-void
-Init_enc(void)
-{
-}
Index: common.mk
===================================================================
--- common.mk	(revision 48622)
+++ common.mk	(revision 48623)
@@ -31,10 +31,9 @@ PLATFORM_D    = ./$(PLATFORM_DIR)/.time https://github.com/ruby/ruby/blob/trunk/common.mk#L31
 RDOCOUT       = $(EXTOUT)/rdoc
 CAPIOUT       = doc/capi
 
-DMYEXT	      = dmyext.$(OBJEXT)
+DMYEXT	      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
 MAINOBJ       = $(NORMALMAINOBJ)
-EXTOBJS	      =
 DLDOBJS	      = $(DMYEXT)
 EXTSOLIBS     =
 MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) miniprelude.$(OBJEXT)
@@ -459,7 +458,7 @@ clear-installed-list: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L458
 clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform
 clean-local:: clean-runnable
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
-	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
+	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time
 	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
 	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb
 clean-runnable:: PHONY
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 48622)
+++ win32/Makefile.sub	(revision 48623)
@@ -362,6 +362,9 @@ EXTOBJS = ext/extinit.$(OBJEXT) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L362
 ! if !defined(ENCSTATIC)
 ENCSTATIC = static
 ! endif
+!else
+ENCOBJS = dmyenc.$(OBJEXT)
+EXTOBJS = dmyext.$(OBJEXT)
 !endif
 
 arch_hdrdir = $(EXTOUT)/include/$(arch)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/