From 2250b195a9fcbbfe752dd6d46a702674ec144272 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 2 Mar 2013 13:49:49 +0000
Subject: [PATCH] Makefile.sub: static-linked-ext

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 win32/Makefile.sub | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2825855f48..8fa198c6b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar  2 22:49:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (EXTOBJS, EXTOBJS, config.h): definitions for
+	  static-linked-ext.  [Bug #7960]
+
 Sat Mar  2 17:34:19 2013  Tanaka Akira  <akr@fsij.org>
 
 	* lib/webrick/utils.rb: use Socket.tcp_server_sockets to create server
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0d10026e10..e988c9beb2 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -355,6 +355,11 @@ COMMON_MACROS = WIN32_LEAN_AND_MEAN WIN32
 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/Makefile.sub $(win_srcdir)/Makefile.sub
 !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)"