mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* Makefile.in (reconfig): force reconfigure with previous options.
* common.mk (showconfig): show configure flags, like as `config.status --config' generated by recent autoconf. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d646c540b7
commit
9be87b1eb6
3 changed files with 23 additions and 3 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Thu Nov 18 07:37:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* Makefile.in (reconfig): force reconfigure with previous options.
|
||||||
|
|
||||||
|
* common.mk (showconfig): show configure flags, like as
|
||||||
|
`config.status --config' generated by recent autoconf.
|
||||||
|
|
||||||
Thu Nov 18 07:16:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Thu Nov 18 07:16:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* missing/langinfo.c (strncasecmp): get rid of redefinition.
|
* missing/langinfo.c (strncasecmp): get rid of redefinition.
|
||||||
|
|
13
Makefile.in
13
Makefile.in
|
@ -145,6 +145,8 @@ SRC_FILE = $<
|
||||||
|
|
||||||
MESSAGE_BEGIN = @for line in
|
MESSAGE_BEGIN = @for line in
|
||||||
MESSAGE_END = ; do echo "$$line"; done
|
MESSAGE_END = ; do echo "$$line"; done
|
||||||
|
|
||||||
|
configure_args = @configure_args@
|
||||||
#### End of variables
|
#### End of variables
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
@ -223,10 +225,15 @@ $(MKFILES): config.status
|
||||||
uncommon.mk: $(srcdir)/common.mk
|
uncommon.mk: $(srcdir)/common.mk
|
||||||
sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
|
sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
|
||||||
|
|
||||||
config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in
|
.PHONY: reconfig
|
||||||
|
reconfig-args = $(srcdir)/configure $(configure_args)
|
||||||
|
config.status-args = ./config.status --recheck
|
||||||
|
reconfig-exec-0 = exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
|
||||||
|
reconfig-exec-1 = set -x; "$$@"
|
||||||
|
|
||||||
|
reconfig config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in
|
||||||
@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
|
@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
|
||||||
set $(SHELL) ./config.status --recheck; \
|
set $(SHELL) $($@-args); $(reconfig-exec-$(V))
|
||||||
exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
|
|
||||||
|
|
||||||
$(srcdir)/configure: $(srcdir)/configure.in
|
$(srcdir)/configure: $(srcdir)/configure.in
|
||||||
$(CHDIR) $(srcdir) && exec $(AUTOCONF)
|
$(CHDIR) $(srcdir) && exec $(AUTOCONF)
|
||||||
|
|
|
@ -150,6 +150,12 @@ showflags:
|
||||||
" SOLIBS = $(SOLIBS)" \
|
" SOLIBS = $(SOLIBS)" \
|
||||||
$(MESSAGE_END)
|
$(MESSAGE_END)
|
||||||
|
|
||||||
|
.PHONY: showconfig
|
||||||
|
showconfig:
|
||||||
|
@$(MESSAGE_BEGIN) \
|
||||||
|
"$(configure_args)" \
|
||||||
|
$(MESSAGE_END)
|
||||||
|
|
||||||
exts: $(MKMAIN_CMD)
|
exts: $(MKMAIN_CMD)
|
||||||
|
|
||||||
$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
|
$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue