summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--common.mk5
-rw-r--r--configure.in3
-rw-r--r--dmyenc.c4
-rw-r--r--dmyext.c5
-rw-r--r--win32/Makefile.sub3
6 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cc0a75..7c71a98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 28 05:02:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@fsij.org>
* common.mk (miniprelude.c): It does not depend on prelude.rb now.
diff --git a/common.mk b/common.mk
index 53f6fd7..15cf9b0 100644
--- a/common.mk
+++ b/common.mk
@@ -31,10 +31,9 @@ PLATFORM_D = ./$(PLATFORM_DIR)/.time
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
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
diff --git a/configure.in b/configure.in
index 6ac18b8..7b29193 100644
--- a/configure.in
+++ b/configure.in
@@ -3240,6 +3240,9 @@ AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
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)
diff --git a/dmyenc.c b/dmyenc.c
new file mode 100644
index 0000000..53646ef
--- /dev/null
+++ b/dmyenc.c
@@ -0,0 +1,4 @@
+void
+Init_enc(void)
+{
+}
diff --git a/dmyext.c b/dmyext.c
index 34ea7a0..4d273f7 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -2,8 +2,3 @@ void
Init_ext(void)
{
}
-
-void
-Init_enc(void)
-{
-}
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 9045f1e..53938f7 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -362,6 +362,9 @@ EXTOBJS = ext/extinit.$(OBJEXT)
! if !defined(ENCSTATIC)
ENCSTATIC = static
! endif
+!else
+ENCOBJS = dmyenc.$(OBJEXT)
+EXTOBJS = dmyext.$(OBJEXT)
!endif
arch_hdrdir = $(EXTOUT)/include/$(arch)