1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Makefile.in, common.mk (probes.h): moved to common.mk and changed to

Browse Source 
see $(srcdir).

* common.mk (probes.dmyh): now created it on $(srcdir) always.

* win32/Makefile.sub (.SUFFIXES): removed common suffix.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-11-19 05:56:38 +00:00
parent 70927cb204
commit 3918bbfac4
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Mon Nov 19 14:54:32 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* Makefile.in, common.mk (probes.h): moved to common.mk and changed to
see $(srcdir).
* common.mk (probes.dmyh): now created it on $(srcdir) always.
* win32/Makefile.sub (.SUFFIXES): removed common suffix.
Mon Nov 19 10:00:10 2012 NARUSE, Yui <naruse@ruby-lang.org> Mon Nov 19 10:00:10 2012 NARUSE, Yui <naruse@ruby-lang.org>
* Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use. * Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use.

2
Makefile.in
View File

@ -331,8 +331,6 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
@$(ECHO) preprocessing $< @$(ECHO) preprocessing $<
$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@ $(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
probes.h: probes.$(DTRACE_EXT)
.d.h: .d.h:
@$(ECHO) translating probes $< @$(ECHO) translating probes $<
$(Q) $(DTRACE) -o $@.tmp -h -s $< $(Q) $(DTRACE) -o $@.tmp -h -s $<

4
common.mk
View File

@ -901,9 +901,11 @@ golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@ $(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@ $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
probes.h: $(srcdir)/probes.$(DTRACE_EXT)
{$(VPATH)}.dmyh.h: {$(VPATH)}.dmyh.h:
@$(ECHO) copying dummy $(DEST_FILE) @$(ECHO) copying dummy $(DEST_FILE)
$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE) $(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)

2
win32/Makefile.sub
View File

@ -55,7 +55,7 @@ iconinc=-I$(icondirs: = -I)
!endif !endif
############### ###############
.SUFFIXES: .y .def .lib .SUFFIXES: .def .lib
!if !defined(CC) !if !defined(CC)
CC = cl CC = cl