1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* common.mk (clean): removes all documents on cleaning.o

(CAPIOUT): new variable.
  (clean-capi, distclean-capi, realclean-capi): new targets

* Makefile.in (clean-capi, distclean-capi, realclean-capi): ditto.

* win32/Makefile.sub (clean-capi, distclean-capi, realclean-capi): 
  ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-09-19 13:10:25 +00:00
parent e8291588c9
commit 4a028d2c7e
4 changed files with 30 additions and 7 deletions

View file

@ -1,3 +1,14 @@
Sun Sep 19 20:37:45 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* common.mk (clean): removes all documents on cleaning.o
(CAPIOUT): new variable.
(clean-capi, distclean-capi, realclean-capi): new targets
* Makefile.in (clean-capi, distclean-capi, realclean-capi): ditto.
* win32/Makefile.sub (clean-capi, distclean-capi, realclean-capi):
ditto.
Sun Sep 19 13:44:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBRUBY_SO): fix an oversight of replace

View file

@ -255,9 +255,6 @@ distclean-local::
@-$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
@-$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
distclean-rdoc:
@$(RMALL) $(RDOCOUT:/=\)
clean-ext distclean-ext realclean-ext::
@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
test "$$#" = 0 && set .; \
@ -285,6 +282,14 @@ clean-enc distclean-enc realclean-enc:
echo $(@:-enc=ing) encodings; \
exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
clean-rdoc distclean-rdoc realclean-rdoc:
@echo $(@:-rdoc=ing) rdoc; \
$(RMALL) $(RDOCOUT:/=\)
clean-capi distclean-capi realclean-capi:
@echo $(@:-capi=ing) capi; \
$(RMALL) $(CAPIOUT:/=\)
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c

View file

@ -18,6 +18,7 @@ RBCONFIG = ./.rbconfig.time
LIBRUBY_EXTS = ./.libruby-with-ext.time
REVISION_H = ./.revision.time
RDOCOUT = $(EXTOUT)/rdoc
CAPIOUT = doc/capi
ID_H_TARGET = -id.h-
DMYEXT = dmyext.$(OBJEXT)
@ -148,11 +149,11 @@ miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DM
GORUBY = go$(RUBY_INSTALL_NAME)
golf: $(LIBRUBY) $(GOLFOBJS) PHONY
$(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
capi: doc/capi/.timestamp PHONY
capi: $(CAPIOUT)/.timestamp PHONY
doc/capi/.timestamp: Doxyfile $(PREP)
@$(MAKEDIRS) doc/capi
@$(DOXYGEN) -b
$(MINIRUBY) -e 'File.open("doc/capi/.timestamp", "w"){|f| f.puts(Time.now)}'
$(MINIRUBY) -e 'File.open("$(CAPIOUT)/.timestamp", "w"){|f| f.puts(Time.now)}'
Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
@ -372,7 +373,7 @@ install-prereq: $(CLEAR_INSTALLED_LIST) PHONY
clear-installed-list: PHONY
@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout
clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout
clean-local:: PHONY
@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
@ -381,7 +382,9 @@ clean-ext:: PHONY
clean-golf: PHONY
@$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
clean-rdoc: PHONY
clean-capi: PHONY
clean-extout: PHONY
clean-docs: clean-rdoc clean-capi
distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
distclean-local:: clean-local
@ -392,6 +395,7 @@ distclean-ext:: PHONY
distclean-golf: clean-golf
@$(RM) $(GOLFPRELUDES)
distclean-rdoc: PHONY
distclean-capi: PHONY
distclean-extout: clean-extout
realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
@ -399,6 +403,7 @@ realclean-local:: distclean-local
@$(RM) parse.c parse.h lex.c newline.c revision.h
realclean-ext::
realclean-golf: distclean-golf
realclean-capi: PHONY
realclean-extout: distclean-extout
clean-enc distclean-enc realclean-enc: PHONY

View file

@ -840,8 +840,10 @@ distclean-local::
@-$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h
@-$(RMDIRS) $(arch_hdrdir:/=\)\ruby
distclean-rdoc:
clean-rdoc distclean-rdoc realclean-rdoc:
@-$(RMALL) $(RDOCOUT:/=\)
clean-capi distclean-capi realclean-capi:
@-$(RMALL) $(CAPIOUT:/=\)
clean-ext distclean-ext realclean-ext::
!if "$(EXTS)" != ""