From 46378ac4ffdea431fcd8094def46acaf1d0b9d92 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 30 Mar 2005 23:26:00 +0000 Subject: * common.mk (RUBYOPT): clear for the environment RubyGems installed. * common.mk (clean-local): keep $(PREP) files till distclean. * common.mk (check): do all tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 +++++++++- Makefile.in | 1 - common.mk | 8 ++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07d895616f..c2298ff603 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Mar 31 08:25:50 2005 Nobuyoshi Nakada + + * common.mk (RUBYOPT): clear for the environment RubyGems installed. + + * common.mk (clean-local): keep $(PREP) files till distclean. + + * common.mk (check): do all tests. + Thu Mar 31 06:00:20 2005 GOTOU Yuuzou * ext/openssl/ossl_engine.c (ossl_engine_s_load): should not raise @@ -17,7 +25,7 @@ Wed Mar 30 23:44:50 2005 Nobuyoshi Nakada Wed Mar 30 17:41:48 2005 Hidetoshi NAGAI - * ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to + * ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to create a Tcl/Tk's console window. * ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method. diff --git a/Makefile.in b/Makefile.in index 4837ca24cf..b677f8216b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,6 @@ RUBY_SO_NAME=@RUBY_SO_NAME@ EXEEXT = @EXEEXT@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) RUBY = $(RUBY_INSTALL_NAME) -RUBYOPT = MINIRUBY = @MINIRUBY@ RUNRUBY = @RUNRUBY@ diff --git a/common.mk b/common.mk index 5723094288..1a6e0467e8 100644 --- a/common.mk +++ b/common.mk @@ -2,6 +2,8 @@ bin: $(PROGRAM) $(WPROGRAM) lib: $(LIBRUBY); dll: $(LIBRUBY_SO); +RUBYOPT = + EXTCONF = extconf.rb RBCONFIG = ./.rbconfig.time @@ -117,7 +119,7 @@ post-install-doc:: PHONY clean: clean-ext clean-local clean-local:: @$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) - @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(PREP) $(ARCHFILE) + @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) clean-ext: @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean @@ -125,13 +127,15 @@ distclean: distclean-ext distclean-local distclean-local:: clean-local @$(RM) $(MKFILES) config.h rbconfig.rb @$(RM) config.cache config.log config.status - @$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output ruby.imp + @$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP) distclean-ext: @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) distclean realclean:: distclean @$(RM) parse.c lex.c +check: test test-all + test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY @$(MINIRUBY) $(srcdir)/rubytest.rb -- cgit v1.2.3