diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 13 insertions, 4 deletions
@@ -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> * Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use. diff --git a/Makefile.in b/Makefile.in index 0306d99b4f..229ef6b0fe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -331,8 +331,6 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd @$(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 $< @@ -901,9 +901,11 @@ golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude. $(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) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 58e97cfe9a..dd9048cc11 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -55,7 +55,7 @@ iconinc=-I$(icondirs: = -I) !endif ############### -.SUFFIXES: .y .def .lib +.SUFFIXES: .def .lib !if !defined(CC) CC = cl |