ruby-changes:25658
From: usa <ko1@a...>
Date: Mon, 19 Nov 2012 14:56:53 +0900 (JST)
Subject: [ruby-changes:25658] usa:r37715 (trunk): * Makefile.in, common.mk (probes.h): moved to common.mk and changed to
usa 2012-11-19 14:56:38 +0900 (Mon, 19 Nov 2012) New Revision: 37715 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37715 Log: * 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. Modified directories: trunk/ Modified files: trunk/ChangeLog trunk/Makefile.in trunk/common.mk trunk/win32/Makefile.sub Index: ChangeLog =================================================================== --- ChangeLog (revision 37714) +++ ChangeLog (revision 37715) @@ -1,3 +1,12 @@ +Mon Nov 19 14:54:32 2012 NAKAMURA Usaku <usa@r...> + + * 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@r...> * Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use. Index: common.mk =================================================================== --- common.mk (revision 37714) +++ common.mk (revision 37715) @@ -901,9 +901,11 @@ $(ECHO) generating $@ $(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 > $@ +probes.h: $(srcdir)/probes.$(DTRACE_EXT) + {$(VPATH)}.dmyh.h: @$(ECHO) copying dummy $(DEST_FILE) $(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE) Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 37714) +++ win32/Makefile.sub (revision 37715) @@ -55,7 +55,7 @@ !endif ############### -.SUFFIXES: .y .def .lib +.SUFFIXES: .def .lib !if !defined(CC) CC = cl Index: Makefile.in =================================================================== --- Makefile.in (revision 37714) +++ Makefile.in (revision 37715) @@ -331,8 +331,6 @@ @$(ECHO) preprocessing $< $(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@ -probes.h: probes.$(DTRACE_EXT) - .d.h: @$(ECHO) translating probes $< $(Q) $(DTRACE) -o $@.tmp -h -s $< Property changes on: . ___________________________________________________________________ Modified: svn:ignore - *.bak *.dylib *.inc *.orig *.pc *.rej *.sav *.swp *_prelude.c *~ .*-* .*.list .*.time .DS_Store .ccmalloc .ext .git .pc .ppack .svn .time.id.h COPYING.LIB ChangeLog-1.8.0 ChangeLog.pre-alpha ChangeLog.pre1_1 Doxyfile GNUmakefile Makefile README.atheos README.fat-patch README.v6 TAGS archive autom4te*.cache automake beos bmlog-* breakpoints.gdb change.log config.cache config.h config.h.in config.log config.status config.status.lineno configure dmyprobes.h enc.mk enc/trans/*.c encdb.h ext/win32ole/.document exts.mk goruby id.h largefile.h lex.c libruby*.* miniprelude.c miniruby newdate.rb newline.c newver.rb parse.c parse.h patches patches-master pitest.rb ppack prelude.c preview probes.h rbconfig.rb rename2.h repack revision.h riscos rubicon ruby ruby-man.rd.gz test.rb tmp transdb.h uncommon.mk verconf.h web y.output y.tab.c yasmdata.rb + *.bak *.dylib *.inc *.orig *.pc *.rej *.sav *.swp *_prelude.c *~ .*-* .*.list .*.time .DS_Store .ccmalloc .ext .git .pc .ppack .svn .time.id.h COPYING.LIB ChangeLog-1.8.0 ChangeLog.pre-alpha ChangeLog.pre1_1 Doxyfile GNUmakefile Makefile README.atheos README.fat-patch README.v6 TAGS archive autom4te*.cache automake beos bmlog-* breakpoints.gdb change.log config.cache config.h config.h.in config.log config.status config.status.lineno configure enc.mk enc/trans/*.c encdb.h ext/win32ole/.document exts.mk goruby id.h largefile.h lex.c libruby*.* miniprelude.c miniruby newdate.rb newline.c newver.rb parse.c parse.h patches patches-master pitest.rb ppack prelude.c preview probes.dmyh probes.h rbconfig.rb rename2.h repack revision.h riscos rubicon ruby ruby-man.rd.gz test.rb tmp transdb.h uncommon.mk verconf.h web y.output y.tab.c yasmdata.rb -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/