1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dmyenc.c: separate

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-11-27 20:02:32 +00:00
parent 3c45a56746
commit 28ad79fac3
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Thu Nov 27 21:58:30 2014 Tanaka Akira <akr@fsij.org>
* common.mk (miniprelude.c): It does not depend on prelude.rb now. * common.mk (miniprelude.c): It does not depend on prelude.rb now.

5
common.mk
View File

@ -31,10 +31,9 @@ PLATFORM_D = ./$(PLATFORM_DIR)/.time
RDOCOUT = $(EXTOUT)/rdoc RDOCOUT = $(EXTOUT)/rdoc
CAPIOUT = doc/capi CAPIOUT = doc/capi
DMYEXT = dmyext.$(OBJEXT) DMYEXT = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
NORMALMAINOBJ = main.$(OBJEXT) NORMALMAINOBJ = main.$(OBJEXT)
MAINOBJ = $(NORMALMAINOBJ) MAINOBJ = $(NORMALMAINOBJ)
EXTOBJS =
DLDOBJS = $(DMYEXT) DLDOBJS = $(DMYEXT)
EXTSOLIBS = EXTSOLIBS =
MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) miniprelude.$(OBJEXT) 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: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform
clean-local:: clean-runnable clean-local:: clean-runnable
$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) $(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) 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 $(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb
clean-runnable:: PHONY clean-runnable:: PHONY

3
configure.in
View File

@ -3240,6 +3240,9 @@ AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
EXTOBJS='ext/extinit.$(OBJEXT)' EXTOBJS='ext/extinit.$(OBJEXT)'
AC_DEFINE_UNQUOTED(EXTSTATIC, 1) AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
AC_SUBST(ENCSTATIC, static) AC_SUBST(ENCSTATIC, static)
], [
ENCOBJS='dmyenc.$(OBJEXT)'
EXTOBJS='dmyext.$(OBJEXT)'
]) ])
AC_SUBST(ENCOBJS) AC_SUBST(ENCOBJS)
AC_SUBST(EXTOBJS) AC_SUBST(EXTOBJS)

4
dmyenc.c Normal file
View File

@ -0,0 +1,4 @@
void
Init_enc(void)
{
}

5
dmyext.c
View File

@ -2,8 +2,3 @@ void
Init_ext(void) Init_ext(void)
{ {
} }
void
Init_enc(void)
{
}

3
win32/Makefile.sub
View File

@ -362,6 +362,9 @@ EXTOBJS = ext/extinit.$(OBJEXT)
! if !defined(ENCSTATIC) ! if !defined(ENCSTATIC)
ENCSTATIC = static ENCSTATIC = static
! endif ! endif
!else
ENCOBJS = dmyenc.$(OBJEXT)
EXTOBJS = dmyext.$(OBJEXT)
!endif !endif
arch_hdrdir = $(EXTOUT)/include/$(arch) arch_hdrdir = $(EXTOUT)/include/$(arch)