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

* Makefile.in, */Makefile.sub, mkconfig.rb: keep rbconfig.rb old if

Browse Source 
unchanged.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-03-04 13:50:48 +00:00
parent d6ad092f0e
commit f9da3539ed
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bcc32/Makefile.sub
View File

@ -1,6 +1,7 @@
# -*- makefile -*- # -*- makefile -*-
SHELL = $(COMSPEC) SHELL = $(COMSPEC)
MAKEFILES = Makefile $(srcdir)bcc32/Makefile.sub
#### Start of system configuration section. #### #### Start of system configuration section. ####
OS = bccwin32 OS = bccwin32
@ -162,6 +163,8 @@ LIBRUBY_SO = $(RUBY_SO_NAME).dll
LIBRUBY = $(RUBY_SO_NAME).lib LIBRUBY = $(RUBY_SO_NAME).lib
LIBRUBYARG = $(LIBRUBY) LIBRUBYARG = $(LIBRUBY)
PREP = miniruby$(EXEEXT)
!ifndef EXTOBJS !ifndef EXTOBJS
EXTOBJS = dmyext.obj EXTOBJS = dmyext.obj
!endif !endif
@ -213,8 +216,7 @@ SCRIPT_ARGS = "--dest-dir=$(DESTDIR)" \
"--make-flags=$(MAKEFLAGS)" "--make-flags=$(MAKEFLAGS)"
EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
all: miniruby$(EXEEXT) rbconfig.rb \ all: $(PREP) rbconfig.rb $(LIBRUBY) $(MISCLIBS)
$(LIBRUBY) $(MISCLIBS)
@$(MINIRUBY) $(srcdir)ext/extmk.rb $(EXTMK_ARGS) @$(MINIRUBY) $(srcdir)ext/extmk.rb $(EXTMK_ARGS)
ruby: $(PROGRAM) ruby: $(PROGRAM)
@ -298,7 +300,7 @@ config.h:
\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" \#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
| |
config.status: Makefile $(srcdir)bcc32/Makefile.sub config.status: $(MAKEFILES)
@echo Creating $@ @echo Creating $@
@type > $@ &&| @type > $@ &&|
# Generated automatically by Makefile.sub. # Generated automatically by Makefile.sub.
@ -425,7 +427,7 @@ $(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@echo $(EXTOBJS) @echo $(EXTOBJS)
$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res $(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
$(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT) $(RUBYDEF): $(LIBRUBY_A) $(PREP)
$(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A) $(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A)
install: install-nodoc $(RDOCTARGET) install: install-nodoc $(RDOCTARGET)
@ -515,7 +517,7 @@ extconf:
$(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)" $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
rbconfig.rb: miniruby$(EXEEXT) config.status rbconfig.rb: $(PREP) config.status
@$(MINIRUBY) $(srcdir)mkconfig.rb -srcdir=$(srcdir) \ @$(MINIRUBY) $(srcdir)mkconfig.rb -srcdir=$(srcdir) \
-install_name=$(RUBY_INSTALL_NAME) \ -install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb -so_name=$(RUBY_SO_NAME) rbconfig.rb

12
win32/Makefile.sub
View File

@ -1,6 +1,7 @@
# -*- makefile -*- # -*- makefile -*-
SHELL = $(COMSPEC) SHELL = $(COMSPEC)
MAKEFILES = Makefile $(srcdir)/wince/Makefile.sub
#### Start of system configuration section. #### #### Start of system configuration section. ####
@ -154,6 +155,8 @@ LIBRUBY_SO = $(RUBY_SO_NAME).dll
LIBRUBY = $(RUBY_SO_NAME).lib LIBRUBY = $(RUBY_SO_NAME).lib
LIBRUBYARG = $(LIBRUBY) LIBRUBYARG = $(LIBRUBY)
PREP = miniruby$(EXEEXT)
!if !defined(EXTSTATIC) !if !defined(EXTSTATIC)
EXTSTATIC = EXTSTATIC =
!endif !endif
@ -209,8 +212,7 @@ SCRIPT_ARGS = "--dest-dir=$(DESTDIR)" \
"--make-flags=$(MAKEFLAGS)" "--make-flags=$(MAKEFLAGS)"
EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
all: ext miniruby$(EXEEXT) rbconfig.rb \ all: ext rbconfig.rb $(LIBRUBY) $(MISCLIBS)
$(LIBRUBY) $(MISCLIBS)
@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
ext: ext:
@ -312,7 +314,7 @@ config.h:
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)" #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
<<KEEP <<KEEP
config.status: Makefile $(srcdir)/win32/Makefile.sub config.status: $(MAKEFILES)
@echo Creating <<$@ @echo Creating <<$@
# Generated automatically by Makefile.sub. # Generated automatically by Makefile.sub.
s,@SHELL@,$$(COMSPEC),;t t s,@SHELL@,$$(COMSPEC),;t t
@ -440,7 +442,7 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $*.res
$(LIBRUBY_LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $*.res $(LIBS) \ $(LIBRUBY_LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $*.res $(LIBS) \
-Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS) -Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS)
$(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT) $(RUBYDEF): $(LIBRUBY_A) $(PREP)
$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
{$(srcdir)/win32}.def.lib: {$(srcdir)/win32}.def.lib:
@ -531,7 +533,7 @@ extconf:
$(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)" $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
rbconfig.rb: miniruby$(EXEEXT) config.status rbconfig.rb: $(PREP) config.status
@$(MINIRUBY) $(srcdir)/mkconfig.rb -srcdir=$(srcdir) \ @$(MINIRUBY) $(srcdir)/mkconfig.rb -srcdir=$(srcdir) \
-install_name=$(RUBY_INSTALL_NAME) \ -install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb -so_name=$(RUBY_SO_NAME) rbconfig.rb