nobu	2013-03-02 22:49:49 +0900 (Sat, 02 Mar 2013)

  New Revision: 39552

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

  Log:
    Makefile.sub: static-linked-ext
    
    * win32/Makefile.sub (EXTOBJS, EXTOBJS, config.h): definitions for
      static-linked-ext.  [Bug #7960]

  Modified files:
    trunk/ChangeLog
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39551)
+++ ChangeLog	(revision 39552)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Mar  2 22:49:47 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/Makefile.sub (EXTOBJS, EXTOBJS, config.h): definitions for
+	  static-linked-ext.  [Bug #7960]
+
 Sat Mar  2 17:34:19 2013  Tanaka Akira  <akr@f...>
 
 	* lib/webrick/utils.rb: use Socket.tcp_server_sockets to create server
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 39551)
+++ win32/Makefile.sub	(revision 39552)
@@ -355,6 +355,11 @@ COMMON_MACROS = WIN32_LEAN_AND_MEAN WIN3 https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L355
 COMMON_HEADERS = winsock2.h ws2tcpip.h windows.h
 !endif
 
+!if "$(EXTSTATIC)" == "static"
+ENCOBJS = enc/encinit.$(OBJEXT) enc/libenc.lib enc/libtrans.lib
+EXTOBJS = ext/extinit.$(OBJEXT)
+!endif
+
 arch_hdrdir = $(EXTOUT)/include/$(arch)
 hdrdir = $(srcdir)/include
 VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(win_srcdir)
@@ -677,6 +682,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/ https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L682
 !endif
 #define LOAD_RELATIVE 1
 #define DLEXT ".so"
+!if "$(EXTSTATIC)" == "static"
+#define EXTSTATIC 1
+!endif
 #define EXECUTABLE_EXTS $(EXECUTABLE_EXTS)
 #define RUBY_COREDLL "$(RT)"
 #define LIBRUBY_SO "$(LIBRUBY_SO)"

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