Skip to content

Commit

Permalink
* configure.in: rm largefile.h.
Browse files Browse the repository at this point in the history
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nurse committed Dec 30, 2007
1 parent 7c1cab2 commit 6c2849d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 11 deletions.
10 changes: 10 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
Sun Dec 30 10:54:49 2007 NARUSE, Yui <[email protected]>

* 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 <[email protected]>

* encoding.c (Init_encoding): register Windows-31J and its alias.
Expand Down
10 changes: 6 additions & 4 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -304,17 +304,18 @@ 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:
@-$(MAKE) -f enc.mk $(MFLAGS) clean

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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 3 additions & 1 deletion enc/Makefile.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
encsrcdir = @srcdir@
topdir = .
prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
top_srcdir = $(encsrcdir:/enc=)
srcdir = $(top_srcdir)
Expand Down Expand Up @@ -45,4 +47,4 @@ all:
clean:

distclean: clean
$(RM) enc.mk
@$(RM) enc.mk
7 changes: 1 addition & 6 deletions enc/depend
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 6c2849d

Please sign in to comment.