mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* {win32,bcc32}/Makefile.sub: remove `=' from --make-flags options.
nmake quotes args if included `=' in args. * instruby.rb: use getopts.rb. * ext/dbm/extconf.rb: substitute ' with ". * ext/gdbm/gdbm.c: add prototypes to avoid VC++ warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
212d3ebfff
commit
c40c0f726b
4 changed files with 14 additions and 10 deletions
|
@ -184,7 +184,7 @@ OBJS = array.obj \
|
|||
|
||||
all: miniruby$(EXEEXT) rbconfig.rb \
|
||||
$(LIBRUBY) $(MISCLIBS)
|
||||
@.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb --extstatic=$(EXTSTATIC) --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS)"
|
||||
@.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb --extstatic=$(EXTSTATIC) --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)"
|
||||
|
||||
ruby: $(PROGRAM)
|
||||
rubyw: $(WPROGRAM)
|
||||
|
@ -407,8 +407,8 @@ $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT)
|
|||
$(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A)
|
||||
|
||||
install: rbconfig.rb
|
||||
$(MINIRUBY) $(srcdir)instruby.rb --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS)" $(DESTDIR)
|
||||
$(MINIRUBY) $(srcdir)ext/extmk.rb --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install
|
||||
$(MINIRUBY) $(srcdir)instruby.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" $(DESTDIR)
|
||||
$(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install
|
||||
|
||||
clean: clean-ext clean-local
|
||||
|
||||
|
@ -425,7 +425,7 @@ clean-local:
|
|||
@if exist *.il? del *.il?
|
||||
|
||||
clean-ext:
|
||||
@-$(MINIRUBY) $(srcdir)ext/extmk.rb --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS)" clean
|
||||
@-$(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" clean
|
||||
|
||||
distclean: distclean-ext distclean-local
|
||||
|
||||
|
@ -459,7 +459,7 @@ distclean-local: clean-local
|
|||
@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
|
||||
|
||||
distclean-ext:
|
||||
@-$(MINIRUBY) $(srcdir)ext/extmk.rb --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS)" distclean
|
||||
@-$(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" distclean
|
||||
|
||||
realclean: distclean
|
||||
@if exist parse.c del parse.c
|
||||
|
|
|
@ -32,7 +32,7 @@ def db_check(db)
|
|||
if have_library(db, db_prefix("dbm_open")) || have_func(db_prefix("dbm_open"))
|
||||
for hdr in $dbm_conf_headers.fetch(db, ["ndbm.h"])
|
||||
if have_header(hdr.dup)
|
||||
$CFLAGS += " " + hsearch + "-DDBM_HDR='<"+hdr+">'"
|
||||
$CFLAGS += " " + hsearch + '-DDBM_HDR="<'+hdr+'>"'
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
|
|
@ -65,6 +65,8 @@ fgdbm_close(obj)
|
|||
return Qnil;
|
||||
}
|
||||
|
||||
static VALUE fgdbm_s_alloc _((VALUE));
|
||||
|
||||
static VALUE
|
||||
fgdbm_s_alloc(klass)
|
||||
VALUE klass;
|
||||
|
@ -511,6 +513,8 @@ fgdbm_invert(obj)
|
|||
return hash;
|
||||
}
|
||||
|
||||
static VALUE each_pair _((VALUE));
|
||||
|
||||
static VALUE
|
||||
each_pair(obj)
|
||||
VALUE obj;
|
||||
|
|
|
@ -171,7 +171,7 @@ OBJS = array.obj \
|
|||
|
||||
all: ext miniruby$(EXEEXT) rbconfig.rb \
|
||||
$(LIBRUBY) $(MISCLIBS)
|
||||
@$(MINIRUBY) $(srcdir)/ext/extmk.rb --extstatic=$(EXTSTATIC) --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS)"
|
||||
@$(MINIRUBY) $(srcdir)/ext/extmk.rb --extstatic=$(EXTSTATIC) --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)"
|
||||
|
||||
ext:
|
||||
@mkdir $@
|
||||
|
@ -408,7 +408,7 @@ $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT)
|
|||
|
||||
install: rbconfig.rb
|
||||
$(MINIRUBY) $(srcdir)/instruby.rb -$(MFLAGS)$(MAKEFLAGS) $(DESTDIR)
|
||||
$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install
|
||||
$(MINIRUBY) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install
|
||||
|
||||
clean: clean-ext clean-local
|
||||
|
||||
|
@ -423,7 +423,7 @@ clean-local:
|
|||
@if exist *.res del *.res
|
||||
|
||||
clean-ext:
|
||||
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS)" clean
|
||||
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" clean
|
||||
|
||||
distclean: distclean-ext distclean-local
|
||||
|
||||
|
@ -457,7 +457,7 @@ distclean-local: clean-local
|
|||
@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
|
||||
|
||||
distclean-ext:
|
||||
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --make-flags="-$(MFLAGS)$(MAKEFLAGS)" distclean
|
||||
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" distclean
|
||||
|
||||
realclean: distclean
|
||||
@if exist parse.c del parse.c
|
||||
|
|
Loading…
Reference in a new issue