diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | common.mk | 10 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | enc/Makefile.in | 4 | ||||
| -rw-r--r-- | enc/depend | 7 |
5 files changed, 21 insertions, 11 deletions
@@ -1,3 +1,13 @@ +Sun Dec 30 10:54:49 2007 NARUSE, Yui <naruse@ruby-lang.org> + + * configure.in: rm largefile.h. + + * common.mk: clean golf, conf*, preludes, and so on. + + * enc/depend: silent and ignore error for rm. + + * enc/Makefile.in: should define prefix and exec_prefix. + Sun Dec 30 06:31:11 2007 NAKAMURA Usaku <usa@ruby-lang.org> * encoding.c (Init_encoding): register Windows-31J and its alias. @@ -304,7 +304,7 @@ clean: clean-ext clean-local clean-enc clean-local:: @$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time - @$(RM) *.inc + @$(RM) *.inc $(GOLFOBJS) clean-ext: @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean clean-enc: @@ -312,9 +312,10 @@ clean-enc: distclean: distclean-ext distclean-local distclean-enc distclean-local:: clean-local - @$(RM) $(MKFILES) config.h rbconfig.rb - @$(RM) config.cache config.log config.status + @$(RM) $(MKFILES) config.h rbconfig.rb yasmdata.rb + @$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES) @$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP) + @-$(RM) ext/ripper/y.output distclean-ext: @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) distclean # -$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h @@ -324,7 +325,7 @@ distclean-enc: clean-enc realclean:: realclean-ext realclean-local realclean-enc realclean-local:: distclean-local - @$(RM) parse.c lex.c + @$(RM) parse.c lex.c revision.h realclean-ext:: @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) realclean realclean-enc:: distclean-enc @@ -676,6 +677,7 @@ prereq: incs srcs preludes preludes: {$(VPATH)}miniprelude.c preludes: {$(srcdir)}golf_prelude.c +PRELUDES = prelude.c miniprelude.c golf_prelude.c docs: $(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT) diff --git a/configure.in b/configure.in index 82f85844e3..efc5dc5b77 100644 --- a/configure.in +++ b/configure.in @@ -1788,6 +1788,7 @@ else tr -d '\015' < confdefs.h > "${config_h}" fi tr -d '\015' < largefile.h > confdefs.h +rm largefile.h BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ ]*=/{' \ -e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \ diff --git a/enc/Makefile.in b/enc/Makefile.in index b9917a12ae..082be84c86 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -1,5 +1,7 @@ encsrcdir = @srcdir@ topdir = . +prefix = @prefix@ +exec_prefix = @exec_prefix@ libdir = @libdir@ top_srcdir = $(encsrcdir:/enc=) srcdir = $(top_srcdir) @@ -45,4 +47,4 @@ all: clean: distclean: clean - $(RM) enc.mk + @$(RM) enc.mk diff --git a/enc/depend b/enc/depend index 099d827ed5..a4040f46c3 100644 --- a/enc/depend +++ b/enc/depend @@ -55,9 +55,4 @@ enc/<%=e%>.$(OBJEXT): $(srcdir)/enc/<%=e%>.c % end clean: - $(RM) $(ENCSOS) - $(RM) $(ENCDEFS) - $(RM) $(ENCOBJS) - $(RM) $(TRANSSOS) - $(RM) $(TRANSDEFS) - $(RM) $(TRANSOBJS) + @$(RM) $(ENCSOS) $(ENCDEFS) $(ENCOBJS) $(TRANSSOS) $(TRANSDEFS) $(TRANSOBJS) |